diff --git a/AutomatedTesting/TestAssets/ReportOneMissingDependency.txt b/AutomatedTesting/TestAssets/ReportOneMissingDependency.txt
new file mode 100644
index 0000000000..24a8493ee5
--- /dev/null
+++ b/AutomatedTesting/TestAssets/ReportOneMissingDependency.txt
@@ -0,0 +1,5 @@
+This is the UUID for libs / particles / milestone2particles . xml. 
+6BDE282B49C957F7B0714B26579BCA9A
+This isn an invalid UUID
+33bdee92F3225688ABEE534F6058593F
+This is another invalid UUID B076CDDC-14DK-50F4-A5E9-7518ABB3E851
\ No newline at end of file
diff --git a/Code/CryEngine/CrySystem/CrySystem_precompiled.cpp b/Code/CryEngine/CrySystem/CrySystem_precompiled.cpp
deleted file mode 100644
index eaa80bbdc1..0000000000
--- a/Code/CryEngine/CrySystem/CrySystem_precompiled.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-// If you make changes in ICryPak.h, make changes here, to dirty the PCH.
-#include "CrySystem_precompiled.h"
diff --git a/Code/CryEngine/CrySystem/crysystem_files.cmake b/Code/CryEngine/CrySystem/crysystem_files.cmake
index 84250de95b..f0398ffb88 100644
--- a/Code/CryEngine/CrySystem/crysystem_files.cmake
+++ b/Code/CryEngine/CrySystem/crysystem_files.cmake
@@ -75,6 +75,5 @@ set(FILES
     ViewSystem/View.h
     ViewSystem/ViewSystem.cpp
     ViewSystem/ViewSystem.h
-    CrySystem_precompiled.cpp
     WindowsErrorReporting.cpp
 )
diff --git a/Code/Framework/AzCore/AzCore/RTTI/TypeInfo.h b/Code/Framework/AzCore/AzCore/RTTI/TypeInfo.h
index 0a7d6367a6..be64f384c7 100644
--- a/Code/Framework/AzCore/AzCore/RTTI/TypeInfo.h
+++ b/Code/Framework/AzCore/AzCore/RTTI/TypeInfo.h
@@ -150,8 +150,13 @@ namespace AZ
     // also needs to be an overload for every version because they all represent overloads for different non-types.
     namespace AzGenericTypeInfo
     {
-        template<typename...>
-        constexpr bool false_v = false;
+        /// Needs to match declared parameter type.
+        template <template <typename...> class> constexpr bool false_v1 = false;
+        template <template <AZStd::size_t...> class> constexpr bool false_v2 = false;
+        template <template <typename, AZStd::size_t> class> constexpr bool false_v3 = false;
+        template <template <typename, typename, AZStd::size_t> class> constexpr bool false_v4 = false;
+        template <template <typename, typename, typename, AZStd::size_t> class> constexpr bool false_v5 = false;
+        template <template <typename, AZStd::size_t, typename> class> constexpr bool false_v6 = false;
 
         template<typename T>
         inline const AZ::TypeId& Uuid()
@@ -162,7 +167,7 @@ namespace AZ
         template<template<typename...> class T>
         inline const AZ::TypeId& Uuid()
         {
-            static_assert(false_v<T>, "Missing specialization for this template. Make sure it's registered for type info support.");
+            static_assert(false_v1<T>, "Missing specialization for this template. Make sure it's registered for type info support.");
             static const AZ::TypeId s_uuid = AZ::TypeId::CreateNull();
             return s_uuid;
         }
@@ -170,7 +175,7 @@ namespace AZ
         template<template<AZStd::size_t...> class T>
         inline const AZ::TypeId& Uuid()
         {
-            static_assert(false_v<T>, "Missing specialization for this template. Make sure it's registered for type info support.");
+            static_assert(false_v2<T>, "Missing specialization for this template. Make sure it's registered for type info support.");
             static const AZ::TypeId s_uuid = AZ::TypeId::CreateNull();
             return s_uuid;
         }
@@ -178,7 +183,7 @@ namespace AZ
         template<template<typename, AZStd::size_t> class T>
         inline const AZ::TypeId& Uuid()
         {
-            static_assert(false_v<T>, "Missing specialization for this template. Make sure it's registered for type info support.");
+            static_assert(false_v3<T>, "Missing specialization for this template. Make sure it's registered for type info support.");
             static const AZ::TypeId s_uuid = AZ::TypeId::CreateNull();
             return s_uuid;
         }
@@ -186,7 +191,7 @@ namespace AZ
         template<template<typename, typename, AZStd::size_t> class T>
         inline const AZ::TypeId& Uuid()
         {
-            static_assert(false_v<T>, "Missing specialization for this template. Make sure it's registered for type info support.");
+            static_assert(false_v4<T>, "Missing specialization for this template. Make sure it's registered for type info support.");
             static const AZ::TypeId s_uuid = AZ::TypeId::CreateNull();
             return s_uuid;
         }
@@ -194,7 +199,7 @@ namespace AZ
         template<template<typename, typename, typename, AZStd::size_t> class T>
         inline const AZ::TypeId& Uuid()
         {
-            static_assert(false_v<T>, "Missing specialization for this template. Make sure it's registered for type info support.");
+            static_assert(false_v5<T>, "Missing specialization for this template. Make sure it's registered for type info support.");
             static const AZ::TypeId s_uuid = AZ::TypeId::CreateNull();
             return s_uuid;
         }
@@ -202,7 +207,7 @@ namespace AZ
         template<template<typename, AZStd::size_t, typename> class T>
         inline const AZ::TypeId& Uuid()
         {
-            static_assert(false_v<T>, "Missing specialization for this template. Make sure it's registered for type info support.");
+            static_assert(false_v6<T>, "Missing specialization for this template. Make sure it's registered for type info support.");
             static const AZ::TypeId s_uuid = AZ::TypeId::CreateNull();
             return s_uuid;
         }
diff --git a/Code/Framework/AzCore/AzCore/std/math.h b/Code/Framework/AzCore/AzCore/std/math.h
index 9e9be7944a..f5e2ac7ea7 100644
--- a/Code/Framework/AzCore/AzCore/std/math.h
+++ b/Code/Framework/AzCore/AzCore/std/math.h
@@ -21,11 +21,14 @@ namespace AZStd
     using std::asin;
     using std::atan;
     using std::atan2;
+    using std::ceil;
     using std::cos;
     using std::exp2;
+    using std::floor;
     using std::fmod;
     using std::round;
     using std::sin;
     using std::sqrt;
     using std::tan;
+    using std::trunc;
 } // namespace AZStd
diff --git a/Code/Framework/AzFramework/AzFramework/Archive/Archive.cpp b/Code/Framework/AzFramework/AzFramework/Archive/Archive.cpp
index 4a80db2b24..04573eb2e5 100644
--- a/Code/Framework/AzFramework/AzFramework/Archive/Archive.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Archive/Archive.cpp
@@ -1681,13 +1681,11 @@ namespace AZ::IO
             AZStd::vector<AZStd::string> files;
             do
             {
-                if (AZStd::wildcard_match(pWildcardIn, fileIterator.m_filename))
-                {
-                    AZStd::string foundFilename{ fileIterator.m_filename };
-                    AZStd::to_lower(foundFilename.begin(), foundFilename.end());
-                    files.emplace_back(AZStd::move(foundFilename));
-                }
-            } while (fileIterator = FindNext(fileIterator));
+                AZStd::string foundFilename{ fileIterator.m_filename };
+                AZStd::to_lower(foundFilename.begin(), foundFilename.end());
+                files.emplace_back(AZStd::move(foundFilename));
+            }
+            while (fileIterator = FindNext(fileIterator));
 
             // Open files in alphabet order.
             AZStd::sort(files.begin(), files.end());
diff --git a/Code/Framework/AzFramework/AzFramework/Physics/Collision/CollisionEvents.cpp b/Code/Framework/AzFramework/AzFramework/Physics/Collision/CollisionEvents.cpp
index 4c9124f594..9f9e5c51ad 100644
--- a/Code/Framework/AzFramework/AzFramework/Physics/Collision/CollisionEvents.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Physics/Collision/CollisionEvents.cpp
@@ -37,9 +37,10 @@ namespace AzPhysics
         if (auto* behaviorContext = azdynamic_cast<AZ::BehaviorContext*>(context))
         {
             behaviorContext->Class<TriggerEvent>()
-                ->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::All)
-                ->Method("GetTriggerEntityId", &TriggerEvent::GetTriggerEntityId)
-                ->Method("GetOtherEntityId", &TriggerEvent::GetOtherEntityId)
+                ->Attribute(AZ::Script::Attributes::Module, "physics")
+                ->Attribute(AZ::Script::Attributes::Category, "Physics")
+                ->Method("Get Trigger EntityId", &TriggerEvent::GetTriggerEntityId)
+                ->Method("Get Other EntityId", &TriggerEvent::GetOtherEntityId)
                 ;
         }
     }
@@ -104,10 +105,11 @@ namespace AzPhysics
         if (auto* behaviorContext = azdynamic_cast<AZ::BehaviorContext*>(context))
         {
             behaviorContext->Class<CollisionEvent>()
-                ->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::All)
-                ->Property("Contacts", BehaviorValueProperty(&CollisionEvent::m_contacts))
-                ->Method("GetBody1EntityId", &CollisionEvent::GetBody1EntityId)
-                ->Method("GetBody2EntityId", &CollisionEvent::GetBody2EntityId)
+                ->Attribute(AZ::Script::Attributes::Module, "physics")
+                ->Attribute(AZ::Script::Attributes::Category, "Physics")
+                ->Property("Contacts", BehaviorValueGetter(&CollisionEvent::m_contacts), nullptr)
+                ->Method("Get Body 1 EntityId", &CollisionEvent::GetBody1EntityId)
+                ->Method("Get Body 2 EntityId", &CollisionEvent::GetBody2EntityId)
                 ;
         }
     }
diff --git a/Code/Framework/AzFramework/AzFramework/Viewport/CameraInput.cpp b/Code/Framework/AzFramework/AzFramework/Viewport/CameraInput.cpp
index 559f7ce460..674e10812b 100644
--- a/Code/Framework/AzFramework/AzFramework/Viewport/CameraInput.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Viewport/CameraInput.cpp
@@ -22,7 +22,11 @@
 namespace AzFramework
 {
     AZ_CVAR(
-        float, ed_cameraSystemDefaultPlaneHeight, 34.0f, nullptr, AZ::ConsoleFunctorFlags::Null,
+        float,
+        ed_cameraSystemDefaultPlaneHeight,
+        34.0f,
+        nullptr,
+        AZ::ConsoleFunctorFlags::Null,
         "The default height of the ground plane to do intersection tests against when orbiting");
     AZ_CVAR(float, ed_cameraSystemBoostMultiplier, 3.0f, nullptr, AZ::ConsoleFunctorFlags::Null, "");
     AZ_CVAR(float, ed_cameraSystemTranslateSpeed, 10.0f, nullptr, AZ::ConsoleFunctorFlags::Null, "");
@@ -41,7 +45,11 @@ namespace AzFramework
     AZ_CVAR(
         AZ::CVarFixedString, ed_cameraSystemTranslateForwardKey, "keyboard_key_alphanumeric_W", nullptr, AZ::ConsoleFunctorFlags::Null, "");
     AZ_CVAR(
-        AZ::CVarFixedString, ed_cameraSystemTranslateBackwardKey, "keyboard_key_alphanumeric_S", nullptr, AZ::ConsoleFunctorFlags::Null,
+        AZ::CVarFixedString,
+        ed_cameraSystemTranslateBackwardKey,
+        "keyboard_key_alphanumeric_S",
+        nullptr,
+        AZ::ConsoleFunctorFlags::Null,
         "");
     AZ_CVAR(
         AZ::CVarFixedString, ed_cameraSystemTranslateLeftKey, "keyboard_key_alphanumeric_A", nullptr, AZ::ConsoleFunctorFlags::Null, "");
@@ -326,7 +334,9 @@ namespace AzFramework
     }
 
     Camera RotateCameraInput::StepCamera(
-        const Camera& targetCamera, const ScreenVector& cursorDelta, [[maybe_unused]] const float scrollDelta,
+        const Camera& targetCamera,
+        const ScreenVector& cursorDelta,
+        [[maybe_unused]] const float scrollDelta,
         [[maybe_unused]] const float deltaTime)
     {
         Camera nextCamera = targetCamera;
@@ -374,7 +384,9 @@ namespace AzFramework
     }
 
     Camera PanCameraInput::StepCamera(
-        const Camera& targetCamera, const ScreenVector& cursorDelta, [[maybe_unused]] const float scrollDelta,
+        const Camera& targetCamera,
+        const ScreenVector& cursorDelta,
+        [[maybe_unused]] const float scrollDelta,
         [[maybe_unused]] const float deltaTime)
     {
         Camera nextCamera = targetCamera;
@@ -473,7 +485,9 @@ namespace AzFramework
     }
 
     Camera TranslateCameraInput::StepCamera(
-        const Camera& targetCamera, [[maybe_unused]] const ScreenVector& cursorDelta, [[maybe_unused]] const float scrollDelta,
+        const Camera& targetCamera,
+        [[maybe_unused]] const ScreenVector& cursorDelta,
+        [[maybe_unused]] const float scrollDelta,
         const float deltaTime)
     {
         Camera nextCamera = targetCamera;
@@ -630,7 +644,9 @@ namespace AzFramework
     }
 
     Camera OrbitDollyScrollCameraInput::StepCamera(
-        const Camera& targetCamera, [[maybe_unused]] const ScreenVector& cursorDelta, const float scrollDelta,
+        const Camera& targetCamera,
+        [[maybe_unused]] const ScreenVector& cursorDelta,
+        const float scrollDelta,
         [[maybe_unused]] const float deltaTime)
     {
         Camera nextCamera = targetCamera;
@@ -666,7 +682,9 @@ namespace AzFramework
     }
 
     Camera OrbitDollyCursorMoveCameraInput::StepCamera(
-        const Camera& targetCamera, const ScreenVector& cursorDelta, [[maybe_unused]] const float scrollDelta,
+        const Camera& targetCamera,
+        const ScreenVector& cursorDelta,
+        [[maybe_unused]] const float scrollDelta,
         [[maybe_unused]] const float deltaTime)
     {
         Camera nextCamera = targetCamera;
@@ -686,7 +704,9 @@ namespace AzFramework
     }
 
     Camera ScrollTranslationCameraInput::StepCamera(
-        const Camera& targetCamera, [[maybe_unused]] const ScreenVector& cursorDelta, const float scrollDelta,
+        const Camera& targetCamera,
+        [[maybe_unused]] const ScreenVector& cursorDelta,
+        const float scrollDelta,
         [[maybe_unused]] const float deltaTime)
     {
         Camera nextCamera = targetCamera;
diff --git a/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/ActionDispatcher.h b/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/ActionDispatcher.h
index c9211e9f26..1eba4f3799 100644
--- a/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/ActionDispatcher.h
+++ b/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/ActionDispatcher.h
@@ -97,7 +97,7 @@ namespace AzManipulatorTestFramework
         if (m_logging)
         {
             AZStd::string message = AZStd::string::format(format, args...);
-            std::cout << "[ActionDispatcher] " << message.c_str() << "\n";
+            AZ_Printf("[ActionDispatcher] %s", message.c_str());
         }
     }
 
diff --git a/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/AzManipulatorTestFrameworkUtils.h b/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/AzManipulatorTestFrameworkUtils.h
index f1c32e4d8d..9d380003e2 100644
--- a/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/AzManipulatorTestFrameworkUtils.h
+++ b/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/AzManipulatorTestFrameworkUtils.h
@@ -21,12 +21,14 @@ namespace AzManipulatorTestFramework
 {
     //! Create a linear manipulator with a unit sphere bound.
     AZStd::shared_ptr<AzToolsFramework::LinearManipulator> CreateLinearManipulator(
-        const AzToolsFramework::ManipulatorManagerId manipulatorManagerId, const AZ::Vector3& position = AZ::Vector3::CreateZero(),
+        const AzToolsFramework::ManipulatorManagerId manipulatorManagerId,
+        const AZ::Vector3& position = AZ::Vector3::CreateZero(),
         float radius = 1.0f);
 
     //! Create a planar manipulator with a unit sphere bound.
     AZStd::shared_ptr<AzToolsFramework::PlanarManipulator> CreatePlanarManipulator(
-        const AzToolsFramework::ManipulatorManagerId manipulatorManagerId, const AZ::Vector3& position = AZ::Vector3::CreateZero(),
+        const AzToolsFramework::ManipulatorManagerId manipulatorManagerId,
+        const AZ::Vector3& position = AZ::Vector3::CreateZero(),
         float radius = 1.0f);
 
     //! Create a mouse pick from the specified ray and screen point.
@@ -39,7 +41,8 @@ namespace AzManipulatorTestFramework
 
     //! Create a mouse interaction from the specified pick, buttons, interaction id and keyboard modifiers.
     AzToolsFramework::ViewportInteraction::MouseInteraction CreateMouseInteraction(
-        const AzToolsFramework::ViewportInteraction::MousePick& mousePick, AzToolsFramework::ViewportInteraction::MouseButtons buttons,
+        const AzToolsFramework::ViewportInteraction::MousePick& mousePick,
+        AzToolsFramework::ViewportInteraction::MouseButtons buttons,
         AzToolsFramework::ViewportInteraction::InteractionId interactionId,
         AzToolsFramework::ViewportInteraction::KeyboardModifiers modifiers);
 
diff --git a/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/ImmediateModeActionDispatcher.h b/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/ImmediateModeActionDispatcher.h
index 6759c2255f..1faf4eff65 100644
--- a/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/ImmediateModeActionDispatcher.h
+++ b/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/ImmediateModeActionDispatcher.h
@@ -12,14 +12,13 @@
 
 #pragma once
 
-#include <AzManipulatorTestFramework/AzManipulatorTestFramework.h>
 #include <AzManipulatorTestFramework/ActionDispatcher.h>
+#include <AzManipulatorTestFramework/AzManipulatorTestFramework.h>
 
 namespace AzManipulatorTestFramework
 {
     //! Dispatches actions immediately to the manipulators.
-    class ImmediateModeActionDispatcher
-        : public ActionDispatcher<ImmediateModeActionDispatcher>
+    class ImmediateModeActionDispatcher : public ActionDispatcher<ImmediateModeActionDispatcher>
     {
         using KeyboardModifier = AzToolsFramework::ViewportInteraction::KeyboardModifier;
         using KeyboardModifiers = AzToolsFramework::ViewportInteraction::KeyboardModifiers;
@@ -62,7 +61,7 @@ namespace AzManipulatorTestFramework
         void MouseLButtonUpImpl() override;
         void MousePositionImpl(const AzFramework::ScreenPoint& position) override;
         void KeyboardModifierDownImpl(const KeyboardModifier& keyModifier) override;
-        void KeyboardModifierUpImpl(const  KeyboardModifier& keyModifier) override;
+        void KeyboardModifierUpImpl(const KeyboardModifier& keyModifier) override;
         void ExpectManipulatorBeingInteractedImpl() override;
         void ExpectManipulatorNotBeingInteractedImpl() override;
         void SetEntityWorldTransformImpl(AZ::EntityId entityId, const AZ::Transform& transform) override;
@@ -97,8 +96,7 @@ namespace AzManipulatorTestFramework
         return this;
     }
 
-    inline ImmediateModeActionDispatcher* ImmediateModeActionDispatcher::GetKeyboardModifiers(
-        KeyboardModifiers& keyboardModifiers)
+    inline ImmediateModeActionDispatcher* ImmediateModeActionDispatcher::GetKeyboardModifiers(KeyboardModifiers& keyboardModifiers)
     {
         keyboardModifiers = GetKeyboardModifiers();
         return this;
diff --git a/Code/Framework/AzManipulatorTestFramework/Source/AzManipulatorTestFrameworkUtils.cpp b/Code/Framework/AzManipulatorTestFramework/Source/AzManipulatorTestFrameworkUtils.cpp
index 985c21cf8e..83746c9490 100644
--- a/Code/Framework/AzManipulatorTestFramework/Source/AzManipulatorTestFrameworkUtils.cpp
+++ b/Code/Framework/AzManipulatorTestFramework/Source/AzManipulatorTestFrameworkUtils.cpp
@@ -30,8 +30,10 @@ namespace AzManipulatorTestFramework
     // create a default sphere view for a manipulator for simple intersection
     template<typename Manipulator>
     void SetupManipulatorView(
-        AZStd::shared_ptr<Manipulator> manipulator, const AzToolsFramework::ManipulatorManagerId manipulatorManagerId,
-        const AZ::Vector3& position, const float radius)
+        AZStd::shared_ptr<Manipulator> manipulator,
+        const AzToolsFramework::ManipulatorManagerId manipulatorManagerId,
+        const AZ::Vector3& position,
+        const float radius)
     {
         // unit sphere view
         auto sphereView = AzToolsFramework::CreateManipulatorViewSphere(
diff --git a/Code/Framework/AzManipulatorTestFramework/Source/DirectManipulatorViewportInteraction.cpp b/Code/Framework/AzManipulatorTestFramework/Source/DirectManipulatorViewportInteraction.cpp
index 5c5f77629c..192202cee2 100644
--- a/Code/Framework/AzManipulatorTestFramework/Source/DirectManipulatorViewportInteraction.cpp
+++ b/Code/Framework/AzManipulatorTestFramework/Source/DirectManipulatorViewportInteraction.cpp
@@ -1,14 +1,14 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
 #include <AzManipulatorTestFramework/DirectManipulatorViewportInteraction.h>
 #include <AzManipulatorTestFramework/ViewportInteraction.h>
@@ -19,10 +19,10 @@ namespace AzManipulatorTestFramework
     using MouseInteraction = AzToolsFramework::ViewportInteraction::MouseInteraction;
     using MouseInteractionEvent = AzToolsFramework::ViewportInteraction::MouseInteractionEvent;
 
-    class CustomManipulatorManager
-        : public AzToolsFramework::ManipulatorManager
+    class CustomManipulatorManager : public AzToolsFramework::ManipulatorManager
     {
         using ManagerBase = AzToolsFramework::ManipulatorManager;
+
     public:
         using ManagerBase::ManagerBase;
 
@@ -31,18 +31,17 @@ namespace AzManipulatorTestFramework
     };
 
     //! Implementation of the manipulator interface using direct access to the manipulator manager.
-    class DirectCallManipulatorManager
-        : public ManipulatorManagerInterface
+    class DirectCallManipulatorManager : public ManipulatorManagerInterface
     {
     public:
         DirectCallManipulatorManager(
-            ViewportInteractionInterface* viewportInteraction,
-            AZStd::shared_ptr<CustomManipulatorManager> manipulatorManager);
-            
+            ViewportInteractionInterface* viewportInteraction, AZStd::shared_ptr<CustomManipulatorManager> manipulatorManager);
+
         // ManipulatorManagerInterface ...
         void ConsumeMouseInteractionEvent(const MouseInteractionEvent& event);
         AzToolsFramework::ManipulatorManagerId GetId() const override;
         bool ManipulatorBeingInteracted() const override;
+
     private:
         // Trigger the updating of manipulator bounds.
         void DrawManipulators(const MouseInteraction& mouseInteraction);
@@ -61,8 +60,7 @@ namespace AzManipulatorTestFramework
     }
 
     DirectCallManipulatorManager::DirectCallManipulatorManager(
-        ViewportInteractionInterface* viewportInteraction,
-        AZStd::shared_ptr<CustomManipulatorManager> manipulatorManager)
+        ViewportInteractionInterface* viewportInteraction, AZStd::shared_ptr<CustomManipulatorManager> manipulatorManager)
         : m_viewportInteraction(viewportInteraction)
         , m_manipulatorManager(AZStd::move(manipulatorManager))
     {
@@ -126,11 +124,9 @@ namespace AzManipulatorTestFramework
 
     DirectCallManipulatorViewportInteraction::DirectCallManipulatorViewportInteraction()
         : m_customManager(
-            AZStd::make_unique<CustomManipulatorManager>(
-                AzToolsFramework::ManipulatorManagerId(AZ::Crc32("TestManipulatorManagerId"))))
+              AZStd::make_unique<CustomManipulatorManager>(AzToolsFramework::ManipulatorManagerId(AZ::Crc32("TestManipulatorManagerId"))))
         , m_viewportInteraction(AZStd::make_unique<ViewportInteraction>())
-        , m_manipulatorManager(
-            AZStd::make_unique<DirectCallManipulatorManager>(m_viewportInteraction.get(), m_customManager))
+        , m_manipulatorManager(AZStd::make_unique<DirectCallManipulatorManager>(m_viewportInteraction.get(), m_customManager))
     {
     }
 
diff --git a/Code/Framework/AzManipulatorTestFramework/Source/ImmediateModeActionDispatcher.cpp b/Code/Framework/AzManipulatorTestFramework/Source/ImmediateModeActionDispatcher.cpp
index ad59d9578a..356a146125 100644
--- a/Code/Framework/AzManipulatorTestFramework/Source/ImmediateModeActionDispatcher.cpp
+++ b/Code/Framework/AzManipulatorTestFramework/Source/ImmediateModeActionDispatcher.cpp
@@ -10,8 +10,8 @@
  *
  */
 
-#include <AzManipulatorTestFramework/ImmediateModeActionDispatcher.h>
 #include <AzManipulatorTestFramework/AzManipulatorTestFrameworkUtils.h>
+#include <AzManipulatorTestFramework/ImmediateModeActionDispatcher.h>
 #include <AzToolsFramework/ComponentMode/EditorComponentModeBus.h>
 #include <AzToolsFramework/Entity/EditorEntityHelpers.h>
 
@@ -33,8 +33,7 @@ namespace AzManipulatorTestFramework
     using KeyboardModifier = AzToolsFramework::ViewportInteraction::KeyboardModifier;
     using MouseInteractionEvent = AzToolsFramework::ViewportInteraction::MouseInteractionEvent;
 
-    ImmediateModeActionDispatcher::ImmediateModeActionDispatcher(
-        ManipulatorViewportInteraction& viewportManipulatorInteraction)
+    ImmediateModeActionDispatcher::ImmediateModeActionDispatcher(ManipulatorViewportInteraction& viewportManipulatorInteraction)
         : m_viewportManipulatorInteraction(viewportManipulatorInteraction)
     {
     }
@@ -126,8 +125,7 @@ namespace AzManipulatorTestFramework
     void ImmediateModeActionDispatcher::EnterComponentModeImpl(const AZ::Uuid& uuid)
     {
         using AzToolsFramework::ComponentModeFramework::ComponentModeSystemRequestBus;
-        ComponentModeSystemRequestBus::Broadcast(
-            &ComponentModeSystemRequestBus::Events::AddSelectedComponentModesOfType, uuid);
+        ComponentModeSystemRequestBus::Broadcast(&ComponentModeSystemRequestBus::Events::AddSelectedComponentModesOfType, uuid);
     }
 
     const AzToolsFramework::ViewportInteraction::MouseInteractionEvent* ImmediateModeActionDispatcher::GetMouseInteractionEvent() const
@@ -144,8 +142,7 @@ namespace AzManipulatorTestFramework
 
     AzToolsFramework::ViewportInteraction::MouseInteractionEvent* ImmediateModeActionDispatcher::GetMouseInteractionEvent()
     {
-        return const_cast<MouseInteractionEvent*>(
-            static_cast<const ImmediateModeActionDispatcher*>(this)->GetMouseInteractionEvent());
+        return const_cast<MouseInteractionEvent*>(static_cast<const ImmediateModeActionDispatcher*>(this)->GetMouseInteractionEvent());
     }
 
     ImmediateModeActionDispatcher* ImmediateModeActionDispatcher::ExpectTrue(bool result)
@@ -162,8 +159,7 @@ namespace AzManipulatorTestFramework
         return this;
     }
 
-    ImmediateModeActionDispatcher* ImmediateModeActionDispatcher::GetEntityWorldTransform(
-        AZ::EntityId entityId, AZ::Transform& transform)
+    ImmediateModeActionDispatcher* ImmediateModeActionDispatcher::GetEntityWorldTransform(AZ::EntityId entityId, AZ::Transform& transform)
     {
         Log("Getting entity world transform");
         transform = AzToolsFramework::GetWorldTransform(entityId);
diff --git a/Code/Framework/AzManipulatorTestFramework/Tests/BusCallTest.cpp b/Code/Framework/AzManipulatorTestFramework/Tests/BusCallTest.cpp
index 8cc906f339..b2da9965e6 100644
--- a/Code/Framework/AzManipulatorTestFramework/Tests/BusCallTest.cpp
+++ b/Code/Framework/AzManipulatorTestFramework/Tests/BusCallTest.cpp
@@ -11,17 +11,18 @@
  */
 
 #include "AzManipulatorTestFrameworkTestFixtures.h"
-#include <AzToolsFramework/ViewportSelection/EditorInteractionSystemViewportSelectionRequestBus.h>
 #include <AzToolsFramework/ViewportSelection/EditorDefaultSelection.h>
+#include <AzToolsFramework/ViewportSelection/EditorInteractionSystemViewportSelectionRequestBus.h>
 
 namespace UnitTest
 {
-    class AzManipulatorTestFrameworkBusCallTestFixture
-        : public LinearManipulatorTestFixture
+    class AzManipulatorTestFrameworkBusCallTestFixture : public LinearManipulatorTestFixture
     {
     protected:
         AzManipulatorTestFrameworkBusCallTestFixture()
-            : LinearManipulatorTestFixture(AzToolsFramework::g_mainManipulatorManagerId) {}
+            : LinearManipulatorTestFixture(AzToolsFramework::g_mainManipulatorManagerId)
+        {
+        }
 
         bool IsManipulatorInteractingBusCall() const
         {
@@ -37,8 +38,8 @@ namespace UnitTest
     TEST_F(AzManipulatorTestFrameworkBusCallTestFixture, ConsumeViewportLeftMouseClick)
     {
         // given a left mouse down ray in world space
-        auto event = AzManipulatorTestFramework::CreateMouseInteractionEvent(
-            m_interaction, AzToolsFramework::ViewportInteraction::MouseEvent::Down);
+        auto event =
+            AzManipulatorTestFramework::CreateMouseInteractionEvent(m_interaction, AzToolsFramework::ViewportInteraction::MouseEvent::Down);
 
         // consume the mouse down and up events
         AzManipulatorTestFramework::DispatchMouseInteractionEvent(event);
@@ -56,8 +57,8 @@ namespace UnitTest
     TEST_F(AzManipulatorTestFrameworkBusCallTestFixture, ConsumeViewportMouseMoveHover)
     {
         // given a left mouse down ray in world space
-        const auto event = AzManipulatorTestFramework::CreateMouseInteractionEvent(
-            m_interaction, AzToolsFramework::ViewportInteraction::MouseEvent::Move);
+        const auto event =
+            AzManipulatorTestFramework::CreateMouseInteractionEvent(m_interaction, AzToolsFramework::ViewportInteraction::MouseEvent::Move);
 
         // consume the mouse move event
         AzManipulatorTestFramework::DispatchMouseInteractionEvent(event);
@@ -75,8 +76,8 @@ namespace UnitTest
     TEST_F(AzManipulatorTestFrameworkBusCallTestFixture, ConsumeViewportMouseMoveActive)
     {
         // given a left mouse down ray in world space
-        auto event = AzManipulatorTestFramework::CreateMouseInteractionEvent(
-            m_interaction, AzToolsFramework::ViewportInteraction::MouseEvent::Down);
+        auto event =
+            AzManipulatorTestFramework::CreateMouseInteractionEvent(m_interaction, AzToolsFramework::ViewportInteraction::MouseEvent::Down);
 
         // consume the mouse down event
         AzManipulatorTestFramework::DispatchMouseInteractionEvent(event);
@@ -110,14 +111,14 @@ namespace UnitTest
         const AZ::Vector3 initialManipulatorPosition = m_linearManipulator->GetLocalPosition();
         m_linearManipulator->InstallMouseMoveCallback(
             [&movementAlongAxis, this](const AzToolsFramework::LinearManipulator::Action& action)
-        {
-            movementAlongAxis = action.LocalPositionOffset();
-            m_linearManipulator->SetLocalPosition(action.LocalPosition());
-        });
+            {
+                movementAlongAxis = action.LocalPositionOffset();
+                m_linearManipulator->SetLocalPosition(action.LocalPosition());
+            });
 
         // given a left mouse down ray in world space
-        auto event = AzManipulatorTestFramework::CreateMouseInteractionEvent(
-            m_interaction, AzToolsFramework::ViewportInteraction::MouseEvent::Down);
+        auto event =
+            AzManipulatorTestFramework::CreateMouseInteractionEvent(m_interaction, AzToolsFramework::ViewportInteraction::MouseEvent::Down);
 
         // consume the mouse down event
         AzManipulatorTestFramework::DispatchMouseInteractionEvent(event);
@@ -134,7 +135,7 @@ namespace UnitTest
         // consume the mouse up event
         event.m_mouseEvent = AzToolsFramework::ViewportInteraction::MouseEvent::Up;
         AzManipulatorTestFramework::DispatchMouseInteractionEvent(event);
- 
+
         // expect the left mouse down/up sanity flags to be set
         EXPECT_TRUE(m_receivedLeftMouseDown);
         EXPECT_TRUE(m_receivedLeftMouseUp);
diff --git a/Code/Framework/AzManipulatorTestFramework/Tests/DirectCallTest.cpp b/Code/Framework/AzManipulatorTestFramework/Tests/DirectCallTest.cpp
index bec61ce9a8..af810c1dcf 100644
--- a/Code/Framework/AzManipulatorTestFramework/Tests/DirectCallTest.cpp
+++ b/Code/Framework/AzManipulatorTestFramework/Tests/DirectCallTest.cpp
@@ -14,10 +14,10 @@
 
 namespace UnitTest
 {
-    class CustomManipulatorManager
-        : public AzToolsFramework::ManipulatorManager
+    class CustomManipulatorManager : public AzToolsFramework::ManipulatorManager
     {
         using ManagerBase = AzToolsFramework::ManipulatorManager;
+
     public:
         using ManagerBase::ManagerBase;
 
@@ -27,17 +27,17 @@ namespace UnitTest
         }
     };
 
-    class AzManipulatorTestFrameworkCustomManagerTestFixture
-        : public LinearManipulatorTestFixture
+    class AzManipulatorTestFrameworkCustomManagerTestFixture : public LinearManipulatorTestFixture
     {
     protected:
         AzManipulatorTestFrameworkCustomManagerTestFixture()
-            : LinearManipulatorTestFixture(AzToolsFramework::ManipulatorManagerId(AZ::Crc32("TestManipulatorManagerId"))) {}
+            : LinearManipulatorTestFixture(AzToolsFramework::ManipulatorManagerId(AZ::Crc32("TestManipulatorManagerId")))
+        {
+        }
 
         void SetUpEditorFixtureImpl() override
         {
-            m_manipulatorManager =
-                AZStd::make_shared<CustomManipulatorManager>(m_manipulatorManagerId);
+            m_manipulatorManager = AZStd::make_shared<CustomManipulatorManager>(m_manipulatorManagerId);
 
             LinearManipulatorTestFixture::SetUpEditorFixtureImpl();
         }
@@ -115,9 +115,9 @@ namespace UnitTest
 
         m_linearManipulator->InstallMouseMoveCallback(
             [&movementAlongAxis](const AzToolsFramework::LinearManipulator::Action& action)
-        {
-            movementAlongAxis = action.m_current.m_localPositionOffset;
-        });
+            {
+                movementAlongAxis = action.m_current.m_localPositionOffset;
+            });
 
         // consume the mouse down event
         m_manipulatorManager->ConsumeViewportMousePress(m_interaction);
@@ -141,4 +141,3 @@ namespace UnitTest
         EXPECT_EQ(movementAlongAxis, expectedPositionAfterMovementAlongAxis);
     }
 } // namespace UnitTest
-
diff --git a/Code/Framework/AzManipulatorTestFramework/Tests/GridSnappingTest.cpp b/Code/Framework/AzManipulatorTestFramework/Tests/GridSnappingTest.cpp
index d6006ba74f..160a9933d9 100644
--- a/Code/Framework/AzManipulatorTestFramework/Tests/GridSnappingTest.cpp
+++ b/Code/Framework/AzManipulatorTestFramework/Tests/GridSnappingTest.cpp
@@ -12,6 +12,7 @@
 
 #include "AzManipulatorTestFrameworkTestFixtures.h"
 
+#include <AZTestShared/Math/MathTestHelpers.h>
 #include <AzCore/std/smart_ptr/unique_ptr.h>
 #include <AzFramework/Viewport/ViewportScreen.h>
 #include <AzManipulatorTestFramework/AzManipulatorTestFramework.h>
@@ -22,7 +23,6 @@
 #include <AzToolsFramework/Manipulators/LinearManipulator.h>
 #include <AzToolsFramework/Manipulators/PlanarManipulator.h>
 #include <AzToolsFramework/ViewportSelection/EditorSelectionUtil.h>
-#include <AZTestShared/Math/MathTestHelpers.h>
 
 namespace UnitTest
 {
@@ -94,7 +94,8 @@ namespace UnitTest
 
     template<typename Manipulator>
     void ValidateManipulatorSnappingBehavior(
-        AZStd::shared_ptr<Manipulator> manipulator, AzManipulatorTestFramework::ImmediateModeActionDispatcher* actionDispatcher,
+        AZStd::shared_ptr<Manipulator> manipulator,
+        AzManipulatorTestFramework::ImmediateModeActionDispatcher* actionDispatcher,
         const AzFramework::CameraState& cameraState)
     {
         manipulator->SetLocalOrientation(AZ::Quaternion::CreateFromEulerAnglesDegrees(AZ::Vector3(180.0f, 0.0f, 135.0f)));
diff --git a/Code/Framework/AzManipulatorTestFramework/Tests/ViewportInteractionTest.cpp b/Code/Framework/AzManipulatorTestFramework/Tests/ViewportInteractionTest.cpp
index 6ba44cc71b..4aad2ea138 100644
--- a/Code/Framework/AzManipulatorTestFramework/Tests/ViewportInteractionTest.cpp
+++ b/Code/Framework/AzManipulatorTestFramework/Tests/ViewportInteractionTest.cpp
@@ -15,8 +15,7 @@
 
 namespace UnitTest
 {
-    class AValidViewportInteraction
-        : public ToolsApplicationFixture
+    class AValidViewportInteraction : public ToolsApplicationFixture
     {
     public:
         AValidViewportInteraction()
@@ -27,8 +26,7 @@ namespace UnitTest
     protected:
         void SetUpEditorFixtureImpl() override
         {
-            m_cameraState =
-                AzFramework::CreateIdentityDefaultCamera(AZ::Vector3::CreateZero(), AZ::Vector2(800.0f, 600.0f));
+            m_cameraState = AzFramework::CreateIdentityDefaultCamera(AZ::Vector3::CreateZero(), AZ::Vector2(800.0f, 600.0f));
         }
 
     public:
diff --git a/Code/Framework/AzManipulatorTestFramework/Tests/WorldSpaceBuilderTest.cpp b/Code/Framework/AzManipulatorTestFramework/Tests/WorldSpaceBuilderTest.cpp
index a6c58971f6..6168e9cece 100644
--- a/Code/Framework/AzManipulatorTestFramework/Tests/WorldSpaceBuilderTest.cpp
+++ b/Code/Framework/AzManipulatorTestFramework/Tests/WorldSpaceBuilderTest.cpp
@@ -11,49 +11,48 @@
  */
 
 #include <AzFramework/Viewport/ViewportScreen.h>
-#include <AzManipulatorTestFramework/AzManipulatorTestFrameworkUtils.h>
 #include <AzManipulatorTestFramework/AzManipulatorTestFramework.h>
+#include <AzManipulatorTestFramework/AzManipulatorTestFrameworkUtils.h>
 #include <AzManipulatorTestFramework/DirectManipulatorViewportInteraction.h>
-#include <AzManipulatorTestFramework/IndirectManipulatorViewportInteraction.h>
 #include <AzManipulatorTestFramework/ImmediateModeActionDispatcher.h>
-#include <AzToolsFramework/ViewportSelection/EditorSelectionUtil.h>
+#include <AzManipulatorTestFramework/IndirectManipulatorViewportInteraction.h>
 #include <AzToolsFramework/UnitTest/AzToolsFrameworkTestHelpers.h>
+#include <AzToolsFramework/ViewportSelection/EditorSelectionUtil.h>
 
 namespace UnitTest
 {
-    class AzManipulatorTestFrameworkWorldSpaceBuilderTestFixture
-        : public ToolsApplicationFixture
+    class AzManipulatorTestFrameworkWorldSpaceBuilderTestFixture : public ToolsApplicationFixture
     {
     protected:
         struct State
         {
             State(AZStd::unique_ptr<AzManipulatorTestFramework::ManipulatorViewportInteraction> viewportManipulatorInteraction)
                 : m_viewportManipulatorInteraction(viewportManipulatorInteraction.release())
-                , m_actionDispatcher(AZStd::make_unique<AzManipulatorTestFramework::ImmediateModeActionDispatcher>(*m_viewportManipulatorInteraction))
-                , m_linearManipulator(
-                    AzManipulatorTestFramework::CreateLinearManipulator(
-                        m_viewportManipulatorInteraction->GetManipulatorManager().GetId(),
-                        /*position=*/AZ::Vector3(0.0f, 50.0f, 0.0f),
-                        /*radius=*/m_boundsRadius))
+                , m_actionDispatcher(
+                      AZStd::make_unique<AzManipulatorTestFramework::ImmediateModeActionDispatcher>(*m_viewportManipulatorInteraction))
+                , m_linearManipulator(AzManipulatorTestFramework::CreateLinearManipulator(
+                      m_viewportManipulatorInteraction->GetManipulatorManager().GetId(),
+                      /*position=*/AZ::Vector3(0.0f, 50.0f, 0.0f),
+                      /*radius=*/m_boundsRadius))
             {
                 // default sanity check call backs
                 m_linearManipulator->InstallLeftMouseDownCallback(
                     [this]([[maybe_unused]] const AzToolsFramework::LinearManipulator::Action& action)
-                {
-                    m_receivedLeftMouseDown = true;
-                });
+                    {
+                        m_receivedLeftMouseDown = true;
+                    });
 
                 m_linearManipulator->InstallMouseMoveCallback(
                     [this]([[maybe_unused]] const AzToolsFramework::LinearManipulator::Action& action)
-                {
-                    m_receivedMouseMove = true;
-                });
+                    {
+                        m_receivedMouseMove = true;
+                    });
 
                 m_linearManipulator->InstallLeftMouseUpCallback(
                     [this]([[maybe_unused]] const AzToolsFramework::LinearManipulator::Action& action)
-                {
-                    m_receivedLeftMouseUp = true;
-                });
+                    {
+                        m_receivedLeftMouseUp = true;
+                    });
             }
 
             ~State() = default;
@@ -79,13 +78,12 @@ namespace UnitTest
     protected:
         void SetUpEditorFixtureImpl() override
         {
-            m_directState = AZStd::make_unique<State>(
-                AZStd::make_unique<AzManipulatorTestFramework::DirectCallManipulatorViewportInteraction>());
-            m_busState = AZStd::make_unique<State>(
-                AZStd::make_unique<AzManipulatorTestFramework::IndirectCallManipulatorViewportInteraction>());
+            m_directState =
+                AZStd::make_unique<State>(AZStd::make_unique<AzManipulatorTestFramework::DirectCallManipulatorViewportInteraction>());
+            m_busState =
+                AZStd::make_unique<State>(AZStd::make_unique<AzManipulatorTestFramework::IndirectCallManipulatorViewportInteraction>());
             m_cameraState =
-                AzFramework::CreateIdentityDefaultCamera(
-                    AZ::Vector3::CreateZero(), AzManipulatorTestFramework::DefaultViewportSize);
+                AzFramework::CreateIdentityDefaultCamera(AZ::Vector3::CreateZero(), AzManipulatorTestFramework::DefaultViewportSize);
         }
 
         void TearDownEditorFixtureImpl() override
@@ -105,8 +103,7 @@ namespace UnitTest
     {
         // given a left mouse down ray in world space
         // consume the mouse down and up events
-        state.m_actionDispatcher
-            ->CameraState(m_cameraState)
+        state.m_actionDispatcher->CameraState(m_cameraState)
             ->MousePosition(AzManipulatorTestFramework::GetCameraStateViewportCenter(m_cameraState))
             ->MouseLButtonDown()
             ->Trace("Expecting left mouse button down")
@@ -126,31 +123,27 @@ namespace UnitTest
             ->ExpectTrue(state.m_receivedLeftMouseUp)
             ->ExpectTrue(state.m_receivedMouseMove)
             ->ExpectFalse(state.m_linearManipulator->PerformingAction())
-            ->ExpectManipulatorNotBeingInteracted()
-            ;
+            ->ExpectManipulatorNotBeingInteracted();
     }
 
     void AzManipulatorTestFrameworkWorldSpaceBuilderTestFixture::ConsumeViewportMouseMoveHover(State& state)
     {
         // given a left mouse down ray in world space
         // consume the mouse move event
-        state.m_actionDispatcher
-            ->CameraState(m_cameraState)
+        state.m_actionDispatcher->CameraState(m_cameraState)
             ->MousePosition(AzManipulatorTestFramework::GetCameraStateViewportCenter(m_cameraState))
             ->ExpectFalse(state.m_linearManipulator->PerformingAction())
             ->ExpectManipulatorNotBeingInteracted()
             ->ExpectFalse(state.m_receivedLeftMouseDown)
             ->ExpectFalse(state.m_receivedMouseMove)
-            ->ExpectFalse(state.m_receivedLeftMouseUp)
-            ;
+            ->ExpectFalse(state.m_receivedLeftMouseUp);
     }
 
     void AzManipulatorTestFrameworkWorldSpaceBuilderTestFixture::ConsumeViewportMouseMoveActive(State& state)
     {
         // given a left mouse down ray in world space
         // consume the mouse move event
-        state.m_actionDispatcher
-            ->CameraState(m_cameraState)
+        state.m_actionDispatcher->CameraState(m_cameraState)
             ->MouseLButtonDown()
             ->MousePosition(AzManipulatorTestFramework::GetCameraStateViewportCenter(m_cameraState))
             ->ExpectTrue(state.m_linearManipulator->PerformingAction())
@@ -158,8 +151,7 @@ namespace UnitTest
             ->MouseLButtonUp()
             ->ExpectTrue(state.m_receivedLeftMouseDown)
             ->ExpectTrue(state.m_receivedMouseMove)
-            ->ExpectTrue(state.m_receivedLeftMouseUp)
-            ;
+            ->ExpectTrue(state.m_receivedLeftMouseUp);
     }
 
     void AzManipulatorTestFrameworkWorldSpaceBuilderTestFixture::MoveManipulatorAlongAxis(State& state)
@@ -176,8 +168,7 @@ namespace UnitTest
         // adjusted final world position taking into account the manipulator position relative to the camera
         const auto finalPositionWorldAdjusted = finalPositionWorld - (vectorToInitialPositionWorld * scaledRadiusBound);
         // calculate the position in screen space of the initial position of the manipulator
-        const auto initialPositionScreen =
-            AzFramework::WorldToScreen(initialPositionWorld, m_cameraState);
+        const auto initialPositionScreen = AzFramework::WorldToScreen(initialPositionWorld, m_cameraState);
         // calculate the position in screen space of the final position of the manipulator
         const auto finalPositionScreen = AzFramework::WorldToScreen(finalPositionWorldAdjusted, m_cameraState);
 
@@ -185,12 +176,11 @@ namespace UnitTest
 
         state.m_linearManipulator->InstallMouseMoveCallback(
             [&movementAlongAxis](const AzToolsFramework::LinearManipulator::Action& action)
-        {
-            movementAlongAxis = action.LocalPosition();
-        });
+            {
+                movementAlongAxis = action.LocalPosition();
+            });
 
-        state.m_actionDispatcher
-            ->CameraState(m_cameraState)
+        state.m_actionDispatcher->CameraState(m_cameraState)
             ->MousePosition(initialPositionScreen)
             ->MouseLButtonDown()
             ->ExpectTrue(state.m_linearManipulator->PerformingAction())
@@ -199,8 +189,7 @@ namespace UnitTest
             ->MouseLButtonUp()
             ->ExpectTrue(state.m_receivedLeftMouseDown)
             ->ExpectTrue(state.m_receivedLeftMouseUp)
-            ->ExpectTrue(movementAlongAxis.IsClose(finalPositionWorld, 0.01f))
-            ;
+            ->ExpectTrue(movementAlongAxis.IsClose(finalPositionWorld, 0.01f));
     }
 
     TEST_F(AzManipulatorTestFrameworkWorldSpaceBuilderTestFixture, ConsumeViewportLeftMouseClick)
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/toolbar/Locked_Status.svg b/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/toolbar/Locked_Status.svg
new file mode 100644
index 0000000000..2612059dce
--- /dev/null
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/toolbar/Locked_Status.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Icon / Locked Status</title>
+    <g id="Icon-/-Locked-Status" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Group-9">
+            <g id="Icons-/-Icon-Grid" transform="translate(17.000000, 15.000000)" fill="#FFFFFF">
+                <path d="M3,0 C4.03553391,-1.90224492e-16 4.875,0.839466094 4.875,1.875 L4.875,3.6 L6,3.6 L6,8 L0,8 L0,3.6 L1.125,3.6 L1.125,1.875 C1.125,0.839466094 1.96446609,1.90224492e-16 3,0 Z M3.375,5.2 L2.625,5.2 L2.625,6.4 L3.375,6.4 L3.375,5.2 Z M3,0.8 C2.37867966,0.8 1.875,1.30367966 1.875,1.925 L1.875,1.925 L1.875,3.6 L4.125,3.6 L4.125,1.925 C4.125,1.30367966 3.62132034,0.8 3,0.8 Z" id="Combined-Shape"></path>
+            </g>
+            <rect id="Rectangle" fill="#F9F9F9" opacity="0" x="0" y="0" width="24" height="24"></rect>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/resources.qrc b/Code/Framework/AzQtComponents/AzQtComponents/Components/resources.qrc
index 00fa95d094..7070bd372b 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/resources.qrc
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/resources.qrc
@@ -356,7 +356,8 @@
     <file>img/UI20/toolbar/Load.svg</file>
 	<file>img/UI20/toolbar/Local.svg</file>
     <file>img/UI20/toolbar/Locked.svg</file>
-    <file>img/UI20/toolbar/LUA.svg</file>
+    <file>img/UI20/toolbar/Locked_Status.svg</file>
+	<file>img/UI20/toolbar/LUA.svg</file>
     <file>img/UI20/toolbar/Material.svg</file>
     <file>img/UI20/toolbar/Measure.svg</file>
     <file>img/UI20/toolbar/Move.svg</file>
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Images/Menu/camera.svg b/Code/Framework/AzQtComponents/AzQtComponents/Images/Menu/camera.svg
new file mode 100644
index 0000000000..7fa565d5b8
--- /dev/null
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Images/Menu/camera.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Camera </title>
+    <g id="Camera-" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Icon-2" fill="#FFFFFF" transform="translate(1.666667, 4.166667)">
+            <path d="M11.5739175,9.2927927 C11.5739175,9.54639717 11.3384276,9.99926232 10.8312187,9.99926232 C10.3240097,9.99926232 2.37169783,10.0264342 2.13620796,10.0264342 C1.74674394,10.0264342 1.33916531,9.69131402 1.33916531,9.09353203 C1.33916531,8.76746913 1.35126587,5.13853395 1.35126587,4.84870026 C1.35126587,4.37772052 1.35727992,4.13013009 1.81014506,4.13013009 C2.2630102,4.13013009 10.840276,4.11201548 10.840276,4.11201548 C11.4199434,4.11201548 11.5829748,4.51959411 11.5829748,4.86377162 C11.5829748,5.20794912 11.5739175,9.03918822 11.5739175,9.2927927 L11.5739175,9.2927927 Z M2.65247422,1.24990779 C2.65247422,1.09593364 2.65247422,0.941959493 2.77927646,0.941959493 L9.83491536,0.941959493 C10.0070041,0.941959493 10.2062648,0.978188705 10.2062648,1.16839206 C10.2062648,1.35859542 10.1972075,2.73530545 10.1972075,2.73530545 L2.64943097,2.7111768 L2.65247422,1.24990779 Z M16.9539554,4.02144245 L16.374288,4.03049976 L14.6896297,5.50684012 L14.2548791,5.50684012 C14.2548791,5.50684012 13.1317736,3.56857731 13.0049713,3.31497283 C12.8781691,3.06136835 12.4615332,2.77153466 12.2622725,2.77153466 L11.139167,2.77153466 C11.139167,2.77153466 11.1210524,0.905730282 11.1210524,0.579667381 C11.1210524,0.253604479 10.8131041,2.81996648e-13 10.4145827,2.81996648e-13 L2.22678099,2.81996648e-13 C1.86144562,2.81996648e-13 1.66522821,0.208317965 1.66522821,0.45887919 L1.66522821,2.69907624 C1.3325716,2.7055975 1.26148988,2.70509029 1.06744623,2.70509029 C0.626681643,2.70509029 0.43343503,2.86812174 0.43343503,3.51423349 L0.43343503,9.83623086 C0.43343503,10.5698724 0.804784446,10.8778207 1.36633722,10.8778207 C1.72862933,10.8778207 11.5920321,10.8687634 12.0992411,10.8687634 C12.60645,10.8687634 12.8238253,10.4340129 13.0049713,10.198523 C13.1861174,9.9630331 14.309223,8.11534333 14.309223,8.11534333 L14.8164319,8.09722872 L16.4558037,9.60074099 L16.97207,9.60074099 L16.9539554,4.02144245 Z" id="Icon"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Images/Menu/debug.svg b/Code/Framework/AzQtComponents/AzQtComponents/Images/Menu/debug.svg
new file mode 100644
index 0000000000..938e4e3342
--- /dev/null
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Images/Menu/debug.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>debug</title>
+    <g id="debug" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M11.3615865,7.917238 L15.2274672,9.63843901 L16.4675037,9.16172668 C16.6979214,9.07292417 16.9553551,9.18924382 17.0442998,9.41972476 C17.1330234,9.64993705 17.0253844,9.89284574 16.7952509,9.98177479 L16.7952509,9.98177479 L15.3951151,10.4956726 C15.2842902,10.5384499 15.1889358,10.4726675 15.0806503,10.4244557 L15.0806503,10.4244557 L14.1703124,10.0191471 C14.3857263,10.9664393 14.4599954,12.0211666 14.2565873,12.952264 L14.2565873,12.952264 L15.6721159,13.5824979 C15.8976398,13.6829076 15.9908466,13.9650071 15.8904369,14.190531 C15.7900905,14.4159128 15.5180189,14.5355501 15.292495,14.4351404 L15.292495,14.4351404 L13.9556938,13.8399581 C13.6322377,14.54733 13.1335636,15.1766897 12.5630158,15.6037725 L12.5630158,15.6037725 L12.8756514,15.7429668 C12.983937,15.7911787 13.0605157,15.8995144 13.1027401,16.0104336 L13.1027401,16.0104336 L13.6353002,17.4447605 C13.7234077,17.6752093 13.6080984,17.9334334 13.3776496,18.021541 C13.2626228,18.0653422 13.1408059,18.058613 13.0364993,18.0121727 C12.9319085,17.9656059 12.8452864,17.8786807 12.8011855,17.7631798 L12.8011855,17.7631798 L12.3264968,16.520128 L11.644667,16.2165578 C10.4621412,16.7117239 8.87932984,16.9345084 7.56328989,16.4483518 L7.56328989,16.4483518 L11.3615865,7.917238 Z M5.52878415,4.3232224 C5.75937506,4.23517812 6.01946614,4.34552927 6.10779463,4.57624672 L6.10779463,4.57624672 L6.58675456,5.80894035 L10.4526353,7.53014136 L6.6529468,16.0643815 C5.4063142,15.4223335 4.43289769,14.215203 4.07288375,12.8629772 L4.07288375,12.8629772 L3.41379116,12.5695302 L2.17275891,13.0473317 C2.05755786,13.0919067 1.93523585,13.0847824 1.83064504,13.0382156 C1.72633845,12.9917753 1.64104404,12.9033978 1.59654788,12.7884022 C1.5078242,12.5581899 1.62471629,12.294881 1.85492858,12.2061574 L1.85492858,12.2061574 L3.27301757,11.6515537 C3.38384243,11.6087763 3.51545059,11.5931314 3.62387829,11.6414065 L3.62387829,11.6414065 L3.91988732,11.7731982 C3.85933759,11.0651327 3.99592287,10.2745607 4.30516824,9.5608618 L4.30516824,9.5608618 L2.97859873,8.970235 C2.7530748,8.86982528 2.6599312,8.58758374 2.76027765,8.36220193 C2.86068737,8.13667801 3.13269567,8.01718285 3.35821959,8.11759257 L3.35821959,8.11759257 L4.7450425,8.73504591 C5.26222301,7.94364898 6.01359598,7.25652125 6.89624338,6.79811742 L6.89624338,6.79811742 L6.10101221,6.4440577 C5.99258451,6.39578258 5.88032145,6.36759526 5.83803372,6.25681811 L5.83803372,6.25681811 L5.26971048,4.90243425 C5.18174504,4.67204872 5.29833534,4.41132994 5.52878415,4.3232224 Z M10.8942352,2.34455584 C11.1427316,2.24942103 11.4210854,2.3733521 11.5165098,2.62161032 L11.5165098,2.62161032 L11.9777045,3.8224019 C12.2035494,3.86678469 12.4283918,3.93403345 12.6476126,4.03163684 C12.8668334,4.12924023 13.0677354,4.25026013 13.2518379,4.38839772 L13.2518379,4.38839772 L14.4533966,3.92589245 C14.7019612,3.83060445 14.9816108,3.95162483 15.0770352,4.19988305 C15.1723915,4.44829447 15.0509158,4.72113321 14.8025726,4.81633622 L14.8025726,4.81633622 L13.9775725,5.12324418 C14.5520125,5.98310253 14.7248639,7.02632912 14.247419,8.09868801 L14.247419,8.09868801 L8.55503156,5.56427385 C9.03247651,4.49191495 9.9234901,3.92253515 10.946252,3.77379694 L10.946252,3.77379694 L10.6171125,2.96698358 C10.5217563,2.71857217 10.6457388,2.43969065 10.8942352,2.34455584 Z" id="Combined-Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Images/Menu/resolution.svg b/Code/Framework/AzQtComponents/AzQtComponents/Images/Menu/resolution.svg
new file mode 100644
index 0000000000..2434d6707d
--- /dev/null
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Images/Menu/resolution.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>resolution</title>
+    <g id="resolution" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M17.7222222,2.5 L17.7222222,17.7222222 L2.5,17.7222222 L2.5,2.5 L17.7222222,2.5 Z M16.721,4.45 L3.499,4.45 L3.499,10.111 L10.1293705,10.1111111 L10.129,16.722 L16.722,16.722 L16.721,4.45 Z M9.128,11.722 L3.999,11.722 L4,16.222 L9.129,16.222 L9.128,11.722 Z" id="Combined-Shape" fill="#FFFFFF" fill-rule="nonzero"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Images/resources.qrc b/Code/Framework/AzQtComponents/AzQtComponents/Images/resources.qrc
index 7b0c6530ab..2487917f67 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Images/resources.qrc
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Images/resources.qrc
@@ -15,4 +15,9 @@
         <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>
+        <file alias="camera.svg">Menu/camera.svg</file>
+    </qresource>
 </RCC>
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/API/ViewPaneOptions.h b/Code/Framework/AzToolsFramework/AzToolsFramework/API/ViewPaneOptions.h
index fb86968ebb..4891d2ef85 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/API/ViewPaneOptions.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/API/ViewPaneOptions.h
@@ -42,6 +42,9 @@ namespace AzToolsFramework
 
         bool detachedWindow = false;                                    ///< set to true if the view pane should use a detached, non-dockable widget. This is to workaround a problem with QOpenGLWidget on macOS. Currently this has no effect on other platforms.
         bool isDisabledInSimMode = false;                               ///< set to true if the view pane should not be openable from level editor menu when editor is in simulation mode.
+
+        bool showOnToolsToolbar = false;                                ///< set to true if the view pane should create a button on the tools toolbar to open/close the pane
+        QString toolbarIcon;                                            ///< path to the icon to use for the toolbar button - only used if showOnToolsToolbar is set to true
     };
 
 } // namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/AzToolsFramework_precompiled.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/AzToolsFramework_precompiled.cpp
deleted file mode 100644
index f9de86bce5..0000000000
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AzToolsFramework_precompiled.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include "AzToolsFramework_precompiled.h"
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/PrefabEditorEntityOwnershipService.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/PrefabEditorEntityOwnershipService.h
index d8eb81dd40..d8bc63cfc6 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/PrefabEditorEntityOwnershipService.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/PrefabEditorEntityOwnershipService.h
@@ -197,7 +197,7 @@ namespace AzToolsFramework
             AZ::IO::PathView filePath, Prefab::InstanceOptionalReference instanceToParentUnder) override;
 
         Prefab::InstanceOptionalReference GetRootPrefabInstance() override;
-
+        
         const AZStd::vector<AZ::Data::Asset<AZ::Data::AssetData>>& GetPlayInEditorAssetData() override;
         //////////////////////////////////////////////////////////////////////////
 
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/AngularManipulator.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/AngularManipulator.cpp
index 9a4a952d8f..6141fd9642 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/AngularManipulator.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/AngularManipulator.cpp
@@ -1,28 +1,32 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
 #include "AngularManipulator.h"
 
 #include <AzFramework/Entity/EntityDebugDisplayBus.h>
-#include <AzToolsFramework/Manipulators/ManipulatorView.h>
 #include <AzToolsFramework/Manipulators/ManipulatorSnapping.h>
+#include <AzToolsFramework/Manipulators/ManipulatorView.h>
 
 namespace AzToolsFramework
 {
-    static const float s_circularRotateThresholdDegrees = 80.0f;
+    static const float CircularRotateThresholdDegrees = 80.0f;
 
     AngularManipulator::ActionInternal AngularManipulator::CalculateManipulationDataStart(
-        const Fixed& fixed, const AZ::Transform& worldFromLocal, const AZ::Transform& localTransform,
-        const AZ::Vector3& rayOrigin, const AZ::Vector3& rayDirection, const float rayDistance)
+        const Fixed& fixed,
+        const AZ::Transform& worldFromLocal,
+        const AZ::Transform& localTransform,
+        const AZ::Vector3& rayOrigin,
+        const AZ::Vector3& rayDirection,
+        const float rayDistance)
     {
         const AZ::Transform worldFromLocalWithTransform = worldFromLocal * localTransform;
         const AZ::Vector3 worldAxis = TransformDirectionNoScaling(worldFromLocalWithTransform, fixed.m_axis);
@@ -35,7 +39,7 @@ namespace AzToolsFramework
         // if angular manipulator axis is at right angles to us, use initial ray direction
         // as plane normal and use hit position on manipulator as plane point
         const float pickAngle = AZ::RadToDeg(AZ::Acos(AZ::Abs(rayDirection.Dot(worldAxis))));
-        if (pickAngle > s_circularRotateThresholdDegrees)
+        if (pickAngle > CircularRotateThresholdDegrees)
         {
             actionInternal.m_start.m_planeNormal = -rayDirection;
             actionInternal.m_start.m_planePoint = rayOrigin + rayDirection * rayDistance;
@@ -43,8 +47,8 @@ namespace AzToolsFramework
 
         // store initial world hit position
         Internal::CalculateRayPlaneIntersectingPoint(
-            rayOrigin, rayDirection, actionInternal.m_start.m_planePoint,
-            actionInternal.m_start.m_planeNormal, actionInternal.m_current.m_worldHitPosition);
+            rayOrigin, rayDirection, actionInternal.m_start.m_planePoint, actionInternal.m_start.m_planeNormal,
+            actionInternal.m_current.m_worldHitPosition);
 
         // store entity transform (to go from local to world space)
         // and store our own starting local transform
@@ -56,31 +60,33 @@ namespace AzToolsFramework
     }
 
     AngularManipulator::Action AngularManipulator::CalculateManipulationDataAction(
-        const Fixed& fixed, ActionInternal& actionInternal, const AZ::Transform& worldFromLocal,
-        const AZ::Transform& localTransform, const bool snapping, const float angleStepDegrees,
-        const AZ::Vector3& rayOrigin, const AZ::Vector3& rayDirection,
+        const Fixed& fixed,
+        ActionInternal& actionInternal,
+        const AZ::Transform& worldFromLocal,
+        const AZ::Transform& localTransform,
+        const bool snapping,
+        const float angleStepDegrees,
+        const AZ::Vector3& rayOrigin,
+        const AZ::Vector3& rayDirection,
         const ViewportInteraction::KeyboardModifiers keyboardModifiers)
     {
         const AZ::Transform worldFromLocalWithTransform = worldFromLocal * localTransform;
         const AZ::Vector3 worldAxis = TransformDirectionNoScaling(worldFromLocalWithTransform, fixed.m_axis);
 
         AZ::Vector3 worldHitPosition = AZ::Vector3::CreateZero();
-        Internal::CalculateRayPlaneIntersectingPoint(rayOrigin, rayDirection,
-            actionInternal.m_start.m_planePoint, actionInternal.m_start.m_planeNormal,
-            worldHitPosition);
+        Internal::CalculateRayPlaneIntersectingPoint(
+            rayOrigin, rayDirection, actionInternal.m_start.m_planePoint, actionInternal.m_start.m_planeNormal, worldHitPosition);
 
         // get vector from center of rotation for current and previous frame
         const AZ::Vector3 center = worldFromLocalWithTransform.GetTranslation();
         const AZ::Vector3 currentWorldHitVector = (worldHitPosition - center).GetNormalizedSafe();
-        const AZ::Vector3 previousWorldHitVector =
-            (actionInternal.m_current.m_worldHitPosition - center).GetNormalizedSafe();
+        const AZ::Vector3 previousWorldHitVector = (actionInternal.m_current.m_worldHitPosition - center).GetNormalizedSafe();
 
         // calculate which direction we rotated
         const AZ::Vector3 worldAxisRight = worldAxis.Cross(previousWorldHitVector);
         const float rotateSign = Sign(currentWorldHitVector.Dot(worldAxisRight));
         // how far did we rotate this frame
-        const float rotationAngleRad = AZ::Acos(AZ::GetMin<float>(
-            1.0f, currentWorldHitVector.Dot(previousWorldHitVector)));
+        const float rotationAngleRad = AZ::Acos(AZ::GetMin<float>(1.0f, currentWorldHitVector.Dot(previousWorldHitVector)));
         actionInternal.m_current.m_worldHitPosition = worldHitPosition;
 
         // if we're snapping, only increment current radians when we know
@@ -148,16 +154,13 @@ namespace AzToolsFramework
         // calculate initial state when mouse press first happens
         m_actionInternal = CalculateManipulationDataStart(
             m_fixed, TransformNormalizedScale(GetSpace()), TransformNormalizedScale(GetLocalTransform()),
-            interaction.m_mousePick.m_rayOrigin, interaction.m_mousePick.m_rayDirection,
-            rayIntersectionDistance);
+            interaction.m_mousePick.m_rayOrigin, interaction.m_mousePick.m_rayDirection, rayIntersectionDistance);
 
         if (m_onLeftMouseDownCallback)
         {
             m_onLeftMouseDownCallback(CalculateManipulationDataAction(
-                m_fixed, m_actionInternal, m_actionInternal.m_start.m_worldFromLocal,
-                m_actionInternal.m_start.m_localTransform, snapping, angleStep,
-                interaction.m_mousePick.m_rayOrigin, interaction.m_mousePick.m_rayDirection,
-                interaction.m_keyboardModifiers));
+                m_fixed, m_actionInternal, m_actionInternal.m_start.m_worldFromLocal, m_actionInternal.m_start.m_localTransform, snapping,
+                angleStep, interaction.m_mousePick.m_rayOrigin, interaction.m_mousePick.m_rayDirection, interaction.m_keyboardModifiers));
         }
     }
 
@@ -167,12 +170,9 @@ namespace AzToolsFramework
         {
             // calculate delta rotation
             m_onMouseMoveCallback(CalculateManipulationDataAction(
-                m_fixed, m_actionInternal, m_actionInternal.m_start.m_worldFromLocal,
-                m_actionInternal.m_start.m_localTransform,
-                AngleSnapping(interaction.m_interactionId.m_viewportId),
-                AngleStep(interaction.m_interactionId.m_viewportId),
-                interaction.m_mousePick.m_rayOrigin, interaction.m_mousePick.m_rayDirection,
-                interaction.m_keyboardModifiers));
+                m_fixed, m_actionInternal, m_actionInternal.m_start.m_worldFromLocal, m_actionInternal.m_start.m_localTransform,
+                AngleSnapping(interaction.m_interactionId.m_viewportId), AngleStep(interaction.m_interactionId.m_viewportId),
+                interaction.m_mousePick.m_rayOrigin, interaction.m_mousePick.m_rayDirection, interaction.m_keyboardModifiers));
         }
     }
 
@@ -181,12 +181,9 @@ namespace AzToolsFramework
         if (m_onLeftMouseUpCallback)
         {
             m_onLeftMouseUpCallback(CalculateManipulationDataAction(
-                m_fixed, m_actionInternal, m_actionInternal.m_start.m_worldFromLocal,
-                m_actionInternal.m_start.m_localTransform,
-                AngleSnapping(interaction.m_interactionId.m_viewportId),
-                AngleStep(interaction.m_interactionId.m_viewportId),
-                interaction.m_mousePick.m_rayOrigin, interaction.m_mousePick.m_rayDirection,
-                interaction.m_keyboardModifiers));
+                m_fixed, m_actionInternal, m_actionInternal.m_start.m_worldFromLocal, m_actionInternal.m_start.m_localTransform,
+                AngleSnapping(interaction.m_interactionId.m_viewportId), AngleStep(interaction.m_interactionId.m_viewportId),
+                interaction.m_mousePick.m_rayOrigin, interaction.m_mousePick.m_rayDirection, interaction.m_keyboardModifiers));
         }
     }
 
@@ -197,12 +194,9 @@ namespace AzToolsFramework
         const ViewportInteraction::MouseInteraction& mouseInteraction)
     {
         m_manipulatorView->Draw(
-            GetManipulatorManagerId(), managerState,
-            GetManipulatorId(), {
-                ApplySpace(GetLocalTransform()), GetNonUniformScale(),
-                AZ::Vector3::CreateZero(), MouseOver()
-            },
-            debugDisplay, cameraState, mouseInteraction);
+            GetManipulatorManagerId(), managerState, GetManipulatorId(),
+            { ApplySpace(GetLocalTransform()), GetNonUniformScale(), AZ::Vector3::CreateZero(), MouseOver() }, debugDisplay, cameraState,
+            mouseInteraction);
     }
 
     void AngularManipulator::SetAxis(const AZ::Vector3& axis)
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/AngularManipulator.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/AngularManipulator.h
index e2f95fce5e..8e0468aa90 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/AngularManipulator.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/AngularManipulator.h
@@ -1,14 +1,14 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
 #pragma once
 
@@ -22,14 +22,14 @@ namespace AzToolsFramework
 {
     class ManipulatorView;
 
-    /// AngularManipulator serves as a visual tool for users to change a component's property based on rotation
-    /// around an axis. The rotation angle increases if the rotation goes counter clock-wise when looking
-    /// in the opposite direction the rotation axis points to.
+    //! AngularManipulator serves as a visual tool for users to change a component's property based on rotation
+    //! around an axis. The rotation angle increases if the rotation goes counter clock-wise when looking
+    //! in the opposite direction the rotation axis points to.
     class AngularManipulator
         : public BaseManipulator
         , public ManipulatorSpaceWithLocalTransform
     {
-        /// Private constructor.
+        //! Private constructor.
         explicit AngularManipulator(const AZ::Transform& worldFromLocal);
 
     public:
@@ -42,33 +42,36 @@ namespace AzToolsFramework
 
         ~AngularManipulator() = default;
 
-        /// A Manipulator must only be created and managed through a shared_ptr.
+        //! A Manipulator must only be created and managed through a shared_ptr.
         static AZStd::shared_ptr<AngularManipulator> MakeShared(const AZ::Transform& worldFromLocal);
 
-        /// The state of the manipulator at the start of an interaction.
+        //! The state of the manipulator at the start of an interaction.
         struct Start
         {
-            AZ::Quaternion m_space; ///< Starting orientation space of manipulator.
-            AZ::Quaternion m_rotation; ///< Starting local rotation of the manipulator.
+            AZ::Quaternion m_space; //!< Starting orientation space of manipulator.
+            AZ::Quaternion m_rotation; //!< Starting local rotation of the manipulator.
         };
 
-        /// The state of the manipulator during an interaction.
+        //! The state of the manipulator during an interaction.
         struct Current
         {
-            AZ::Quaternion m_delta; ///< Amount of rotation to apply to manipulator during action.
+            AZ::Quaternion m_delta; //!< Amount of rotation to apply to manipulator during action.
         };
 
-        /// Mouse action data used by MouseActionCallback (wraps Start and Current manipulator state).
+        //! Mouse action data used by MouseActionCallback (wraps Start and Current manipulator state).
         struct Action
         {
             Start m_start;
             Current m_current;
             ViewportInteraction::KeyboardModifiers m_modifiers;
-            AZ::Quaternion LocalOrientation() const { return m_start.m_rotation * m_current.m_delta; }
+            AZ::Quaternion LocalOrientation() const
+            {
+                return m_start.m_rotation * m_current.m_delta;
+            }
         };
 
-        /// This is the function signature of callbacks that will be invoked whenever a manipulator
-        /// is clicked on or dragged.
+        //! This is the function signature of callbacks that will be invoked whenever a manipulator
+        //! is clicked on or dragged.
         using MouseActionCallback = AZStd::function<void(const Action&)>;
 
         void InstallLeftMouseDownCallback(const MouseActionCallback& onMouseDownCallback);
@@ -82,46 +85,49 @@ namespace AzToolsFramework
             const ViewportInteraction::MouseInteraction& mouseInteraction) override;
 
         void SetAxis(const AZ::Vector3& axis);
-        const AZ::Vector3& GetAxis() const { return m_fixed.m_axis; }
+        const AZ::Vector3& GetAxis() const
+        {
+            return m_fixed.m_axis;
+        }
 
         void SetView(AZStd::unique_ptr<ManipulatorView>&& view);
-        ManipulatorView* GetView() const { return m_manipulatorView.get(); }
+        ManipulatorView* GetView() const
+        {
+            return m_manipulatorView.get();
+        }
 
     private:
-        void OnLeftMouseDownImpl(
-            const ViewportInteraction::MouseInteraction& interaction, float rayIntersectionDistance) override;
-        void OnLeftMouseUpImpl(
-            const ViewportInteraction::MouseInteraction& interaction) override;
-        void OnMouseMoveImpl(
-            const ViewportInteraction::MouseInteraction& interaction) override;
+        void OnLeftMouseDownImpl(const ViewportInteraction::MouseInteraction& interaction, float rayIntersectionDistance) override;
+        void OnLeftMouseUpImpl(const ViewportInteraction::MouseInteraction& interaction) override;
+        void OnMouseMoveImpl(const ViewportInteraction::MouseInteraction& interaction) override;
 
         void SetBoundsDirtyImpl() override;
         void InvalidateImpl() override;
 
-        /// Unchanging data set once for the angular manipulator.
+        //! Unchanging data set once for the angular manipulator.
         struct Fixed
         {
-            AZ::Vector3 m_axis = AZ::Vector3::CreateAxisX(); ///< Axis for this angular manipulator to rotate around.
+            AZ::Vector3 m_axis = AZ::Vector3::CreateAxisX(); //!< Axis for this angular manipulator to rotate around.
         };
 
-        /// Initial data recorded when a press first happens with an angular manipulator.
+        //! Initial data recorded when a press first happens with an angular manipulator.
         struct StartInternal
         {
-            AZ::Transform m_worldFromLocal; ///< Initial transform when pressed.
-            AZ::Transform m_localTransform; ///< Additional transform (offset) to apply to manipulator.
-            AZ::Vector3 m_planePoint; ///< Position on plane to use for ray intersection.
-            AZ::Vector3 m_planeNormal; ///< Normal of plane to use for ray intersection.
+            AZ::Transform m_worldFromLocal; //!< Initial transform when pressed.
+            AZ::Transform m_localTransform; //!< Additional transform (offset) to apply to manipulator.
+            AZ::Vector3 m_planePoint; //!< Position on plane to use for ray intersection.
+            AZ::Vector3 m_planeNormal; //!< Normal of plane to use for ray intersection.
         };
 
-        /// Current data recorded each frame during an interaction with an angular manipulator.
+        //! Current data recorded each frame during an interaction with an angular manipulator.
         struct CurrentInternal
         {
-            float m_preSnapRadians = 0.0f; ///< Amount of rotation before a snap (snap increment accumulator).
-            float m_radians = 0.0f; ///< Amount of rotation about the axis for this action.
-            AZ::Vector3 m_worldHitPosition; ///< Initial world space hit position.
+            float m_preSnapRadians = 0.0f; //!< Amount of rotation before a snap (snap increment accumulator).
+            float m_radians = 0.0f; //!< Amount of rotation about the axis for this action.
+            AZ::Vector3 m_worldHitPosition; //!< Initial world space hit position.
         };
 
-        /// Wrap start and current internal data during an interaction with an angular manipulator.
+        //! Wrap start and current internal data during an interaction with an angular manipulator.
         struct ActionInternal
         {
             StartInternal m_start;
@@ -135,16 +141,25 @@ namespace AzToolsFramework
         MouseActionCallback m_onLeftMouseUpCallback = nullptr;
         MouseActionCallback m_onMouseMoveCallback = nullptr;
 
-        AZStd::unique_ptr<ManipulatorView> m_manipulatorView; ///< Look of manipulator.
+        AZStd::unique_ptr<ManipulatorView> m_manipulatorView; //!< Look of manipulator.
 
         static ActionInternal CalculateManipulationDataStart(
-            const Fixed& fixed, const AZ::Transform& worldFromLocal, const AZ::Transform& localTransform,
-            const AZ::Vector3& rayOrigin, const AZ::Vector3& rayDirection, float rayDistance);
+            const Fixed& fixed,
+            const AZ::Transform& worldFromLocal,
+            const AZ::Transform& localTransform,
+            const AZ::Vector3& rayOrigin,
+            const AZ::Vector3& rayDirection,
+            float rayDistance);
 
         static Action CalculateManipulationDataAction(
-            const Fixed& fixed, ActionInternal& actionInternal, const AZ::Transform& worldFromLocal,
-            const AZ::Transform& localTransform, bool snapping, float angleStepDegrees,
-            const AZ::Vector3& rayOrigin, const AZ::Vector3& rayDirection,
+            const Fixed& fixed,
+            ActionInternal& actionInternal,
+            const AZ::Transform& worldFromLocal,
+            const AZ::Transform& localTransform,
+            bool snapping,
+            float angleStepDegrees,
+            const AZ::Vector3& rayOrigin,
+            const AZ::Vector3& rayDirection,
             ViewportInteraction::KeyboardModifiers keyboardModifiers);
     };
 } // namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/BaseManipulator.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/BaseManipulator.cpp
index 955d10d3bd..73d0dc72be 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/BaseManipulator.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/BaseManipulator.cpp
@@ -1,33 +1,30 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
 #include "BaseManipulator.h"
 
 #include <AzCore/Math/IntersectSegment.h>
-#include <AzToolsFramework/Viewport/ViewportMessages.h>
 #include <AzToolsFramework/Entity/EditorEntityHelpers.h>
+#include <AzToolsFramework/Viewport/ViewportMessages.h>
 
 namespace AzToolsFramework
 {
-    AZ_CVAR(
-        bool, cl_manipulatorDrawDebug, false, nullptr, AZ::ConsoleFunctorFlags::Null,
-        "Enable debug drawing for Manipulators");
+    AZ_CVAR(bool, cl_manipulatorDrawDebug, false, nullptr, AZ::ConsoleFunctorFlags::Null, "Enable debug drawing for Manipulators");
 
     const AZ::Color BaseManipulator::s_defaultMouseOverColor = AZ::Color(1.0f, 1.0f, 0.0f, 1.0f); // yellow
 
     AZ_CLASS_ALLOCATOR_IMPL(BaseManipulator, AZ::SystemAllocator, 0)
 
-        static bool EntityIdAndEntityComponentIdComparison(
-            const AZ::EntityId entityId, const AZ::EntityComponentIdPair& entityComponentId)
+    static bool EntityIdAndEntityComponentIdComparison(const AZ::EntityId entityId, const AZ::EntityComponentIdPair& entityComponentId)
     {
         return entityId == entityComponentId.GetEntityId();
     }
@@ -38,8 +35,7 @@ namespace AzToolsFramework
         EndUndoBatch();
     }
 
-    bool BaseManipulator::OnLeftMouseDown(
-        const ViewportInteraction::MouseInteraction& interaction, const float rayIntersectionDistance)
+    bool BaseManipulator::OnLeftMouseDown(const ViewportInteraction::MouseInteraction& interaction, const float rayIntersectionDistance)
     {
         AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
 
@@ -57,8 +53,7 @@ namespace AzToolsFramework
 
             (*this.*m_onLeftMouseDownImpl)(interaction, rayIntersectionDistance);
 
-            ToolsApplicationNotificationBus::Broadcast(
-                &ToolsApplicationNotificationBus::Events::InvalidatePropertyDisplay, Refresh_Values);
+            ToolsApplicationNotificationBus::Broadcast(&ToolsApplicationNotificationBus::Events::InvalidatePropertyDisplay, Refresh_Values);
 
             return true;
         }
@@ -66,8 +61,7 @@ namespace AzToolsFramework
         return false;
     }
 
-    bool BaseManipulator::OnRightMouseDown(
-        const ViewportInteraction::MouseInteraction& interaction, const float rayIntersectionDistance)
+    bool BaseManipulator::OnRightMouseDown(const ViewportInteraction::MouseInteraction& interaction, const float rayIntersectionDistance)
     {
         AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
 
@@ -85,8 +79,7 @@ namespace AzToolsFramework
 
             (*this.*m_onRightMouseDownImpl)(interaction, rayIntersectionDistance);
 
-            ToolsApplicationNotificationBus::Broadcast(
-                &ToolsApplicationNotificationBus::Events::InvalidatePropertyDisplay, Refresh_Values);
+            ToolsApplicationNotificationBus::Broadcast(&ToolsApplicationNotificationBus::Events::InvalidatePropertyDisplay, Refresh_Values);
 
             return true;
         }
@@ -118,8 +111,7 @@ namespace AzToolsFramework
         EndUndoBatch();
     }
 
-    bool BaseManipulator::OnMouseOver(
-        const ManipulatorId manipulatorId, const ViewportInteraction::MouseInteraction& interaction)
+    bool BaseManipulator::OnMouseOver(const ManipulatorId manipulatorId, const ViewportInteraction::MouseInteraction& interaction)
     {
         AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
 
@@ -132,8 +124,7 @@ namespace AzToolsFramework
     {
         OnMouseWheelImpl(interaction);
 
-        ToolsApplicationNotificationBus::Broadcast(
-            &ToolsApplicationNotificationBus::Events::InvalidatePropertyDisplay, Refresh_Values);
+        ToolsApplicationNotificationBus::Broadcast(&ToolsApplicationNotificationBus::Events::InvalidatePropertyDisplay, Refresh_Values);
     }
 
     void BaseManipulator::OnMouseMove(const ViewportInteraction::MouseInteraction& interaction)
@@ -142,16 +133,13 @@ namespace AzToolsFramework
 
         if (!m_performingAction)
         {
-            AZ_Warning(
-                "Manipulators", false,
-                "MouseMove action received, but this manipulator is not performing an action");
+            AZ_Warning("Manipulators", false, "MouseMove action received, but this manipulator is not performing an action");
 
             return;
         }
 
         // ensure property grid (entity inspector) values are refreshed
-        ToolsApplicationNotificationBus::Broadcast(
-            &ToolsApplicationNotificationBus::Events::InvalidatePropertyDisplay, Refresh_Values);
+        ToolsApplicationNotificationBus::Broadcast(&ToolsApplicationNotificationBus::Events::InvalidatePropertyDisplay, Refresh_Values);
 
         OnMouseMoveImpl(interaction);
     }
@@ -170,16 +158,14 @@ namespace AzToolsFramework
             Unregister();
         }
 
-        ManipulatorManagerRequestBus::Event(managerId,
-            &ManipulatorManagerRequestBus::Events::RegisterManipulator, shared_from_this());
+        ManipulatorManagerRequestBus::Event(managerId, &ManipulatorManagerRequestBus::Events::RegisterManipulator, shared_from_this());
     }
 
     void BaseManipulator::Unregister()
     {
         // if the manipulator has already been unregistered, the m_manipulatorManagerId
         // should be invalid which makes the call below a no-op.
-        ManipulatorManagerRequestBus::Event(m_manipulatorManagerId,
-            &ManipulatorManagerRequestBus::Events::UnregisterManipulator, this);
+        ManipulatorManagerRequestBus::Event(m_manipulatorManagerId, &ManipulatorManagerRequestBus::Events::UnregisterManipulator, this);
     }
 
     void BaseManipulator::Invalidate()
@@ -197,8 +183,7 @@ namespace AzToolsFramework
         if (m_performingAction)
         {
             AZ_Warning(
-                "Manipulators", false,
-                "MouseDown action received, but the manipulator (id: %d) is still performing an action",
+                "Manipulators", false, "MouseDown action received, but the manipulator (id: %d) is still performing an action",
                 GetManipulatorId());
 
             return;
@@ -214,8 +199,7 @@ namespace AzToolsFramework
         if (!m_performingAction)
         {
             AZ_Warning(
-                "Manipulators", false,
-                "MouseUp action received, but this manipulator (id: %d) didn't receive MouseDown action before",
+                "Manipulators", false, "MouseUp action received, but this manipulator (id: %d) didn't receive MouseDown action before",
                 GetManipulatorId());
             return;
         }
@@ -263,13 +247,13 @@ namespace AzToolsFramework
             if (entityComponentIdPair.GetComponentId() != AZ::InvalidComponentId)
             {
                 PropertyEditorEntityChangeNotificationBus::Event(
-                    entityComponentIdPair.GetEntityId(),
-                    &PropertyEditorEntityChangeNotifications::OnEntityComponentPropertyChanged,
+                    entityComponentIdPair.GetEntityId(), &PropertyEditorEntityChangeNotifications::OnEntityComponentPropertyChanged,
                     entityComponentIdPair.GetComponentId());
             }
             else
             {
-                AZ_Warning("Manipulators", false,
+                AZ_Warning(
+                    "Manipulators", false,
                     "This Manipulator was only registered with an EntityId and not an EntityComponentIdPair. "
                     "Please use AddEntityComponentIdPair() instead of AddEntityId() when registering what this "
                     "Manipulator is changing.");
@@ -280,8 +264,7 @@ namespace AzToolsFramework
                 for (const AZ::Component* component : entity->GetComponents())
                 {
                     PropertyEditorEntityChangeNotificationBus::Event(
-                        entity->GetId(), &PropertyEditorEntityChangeNotifications::OnEntityComponentPropertyChanged,
-                        component->GetId());
+                        entity->GetId(), &PropertyEditorEntityChangeNotifications::OnEntityComponentPropertyChanged, component->GetId());
                 }
             }
         }
@@ -298,9 +281,7 @@ namespace AzToolsFramework
         {
             // look for a match (keep looking in case we have several entity ids with different component ids)
             const auto entityComponentPairId =
-                m_entityComponentIdPairs.find_as(
-                    entityId, AZStd::hash<AZ::EntityId>(),
-                    &EntityIdAndEntityComponentIdComparison);
+                m_entityComponentIdPairs.find_as(entityId, AZStd::hash<AZ::EntityId>(), &EntityIdAndEntityComponentIdComparison);
 
             // update the afterErased variable so we can return an iterator
             // to the correct position in the container.
@@ -334,9 +315,8 @@ namespace AzToolsFramework
 
     bool BaseManipulator::HasEntityId(const AZ::EntityId entityId) const
     {
-        return m_entityComponentIdPairs.find_as(
-            entityId, AZStd::hash<AZ::EntityId>(),
-            &EntityIdAndEntityComponentIdComparison) != m_entityComponentIdPairs.end();
+        return m_entityComponentIdPairs.find_as(entityId, AZStd::hash<AZ::EntityId>(), &EntityIdAndEntityComponentIdComparison) !=
+            m_entityComponentIdPairs.end();
     }
 
     bool BaseManipulator::HasEntityComponentIdPair(const AZ::EntityComponentIdPair& entityComponentIdPair) const
@@ -346,7 +326,8 @@ namespace AzToolsFramework
 
     void Manipulators::Register(const ManipulatorManagerId manipulatorManagerId)
     {
-        ProcessManipulators([manipulatorManagerId](BaseManipulator* manipulator)
+        ProcessManipulators(
+            [manipulatorManagerId](BaseManipulator* manipulator)
             {
                 manipulator->Register(manipulatorManagerId);
             });
@@ -354,7 +335,8 @@ namespace AzToolsFramework
 
     void Manipulators::Unregister()
     {
-        ProcessManipulators([](BaseManipulator* manipulator)
+        ProcessManipulators(
+            [](BaseManipulator* manipulator)
             {
                 if (manipulator->Registered())
                 {
@@ -365,7 +347,8 @@ namespace AzToolsFramework
 
     void Manipulators::SetBoundsDirty()
     {
-        ProcessManipulators([](BaseManipulator* manipulator)
+        ProcessManipulators(
+            [](BaseManipulator* manipulator)
             {
                 manipulator->SetBoundsDirty();
             });
@@ -373,7 +356,8 @@ namespace AzToolsFramework
 
     void Manipulators::AddEntityComponentIdPair(const AZ::EntityComponentIdPair& entityComponentIdPair)
     {
-        ProcessManipulators([&entityComponentIdPair](BaseManipulator* manipulator)
+        ProcessManipulators(
+            [&entityComponentIdPair](BaseManipulator* manipulator)
             {
                 manipulator->AddEntityComponentIdPair(entityComponentIdPair);
             });
@@ -381,7 +365,8 @@ namespace AzToolsFramework
 
     void Manipulators::RemoveEntityComponentIdPair(const AZ::EntityComponentIdPair& entityComponentIdPair)
     {
-        ProcessManipulators([&entityComponentIdPair](BaseManipulator* manipulator)
+        ProcessManipulators(
+            [&entityComponentIdPair](BaseManipulator* manipulator)
             {
                 manipulator->RemoveEntityComponentIdPair(entityComponentIdPair);
             });
@@ -389,7 +374,8 @@ namespace AzToolsFramework
 
     void Manipulators::RemoveEntityId(const AZ::EntityId entityId)
     {
-        ProcessManipulators([entityId](BaseManipulator* manipulator)
+        ProcessManipulators(
+            [entityId](BaseManipulator* manipulator)
             {
                 manipulator->RemoveEntityId(entityId);
             });
@@ -398,7 +384,8 @@ namespace AzToolsFramework
     bool Manipulators::PerformingAction()
     {
         bool performingAction = false;
-        ProcessManipulators([&performingAction](BaseManipulator* manipulator)
+        ProcessManipulators(
+            [&performingAction](BaseManipulator* manipulator)
             {
                 if (manipulator->PerformingAction())
                 {
@@ -412,7 +399,8 @@ namespace AzToolsFramework
     bool Manipulators::Registered()
     {
         bool registered = false;
-        ProcessManipulators([&registered](BaseManipulator* manipulator)
+        ProcessManipulators(
+            [&registered](BaseManipulator* manipulator)
             {
                 if (manipulator->Registered())
                 {
@@ -470,8 +458,12 @@ namespace AzToolsFramework
 
     namespace Internal
     {
-        bool CalculateRayPlaneIntersectingPoint(const AZ::Vector3& rayOrigin, const AZ::Vector3& rayDirection,
-            const AZ::Vector3& pointOnPlane, const AZ::Vector3& planeNormal, AZ::Vector3& resultIntersectingPoint)
+        bool CalculateRayPlaneIntersectingPoint(
+            const AZ::Vector3& rayOrigin,
+            const AZ::Vector3& rayDirection,
+            const AZ::Vector3& pointOnPlane,
+            const AZ::Vector3& planeNormal,
+            AZ::Vector3& resultIntersectingPoint)
         {
             float t = 0.0f;
             if (AZ::Intersect::IntersectRayPlane(rayOrigin, rayDirection, pointOnPlane, planeNormal, t) > 0)
@@ -484,11 +476,12 @@ namespace AzToolsFramework
         }
 
         AZ::Vector3 TryConstrainHitPositionToView(
-            const AZ::Vector3& currentLocalHitPosition, const AZ::Vector3& startLocalHitPosition,
-            const AZ::Transform& localFromWorld, const AzFramework::CameraState& cameraState)
+            const AZ::Vector3& currentLocalHitPosition,
+            const AZ::Vector3& startLocalHitPosition,
+            const AZ::Transform& localFromWorld,
+            const AzFramework::CameraState& cameraState)
         {
-            if (currentLocalHitPosition.GetDistance(localFromWorld.TransformPoint(cameraState.m_position))
-                > cameraState.m_farClip)
+            if (currentLocalHitPosition.GetDistance(localFromWorld.TransformPoint(cameraState.m_position)) > cameraState.m_farClip)
             {
                 return startLocalHitPosition;
             }
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/BaseManipulator.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/BaseManipulator.h
index 2b078f62b7..04f2bc456b 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/BaseManipulator.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/BaseManipulator.h
@@ -1,14 +1,14 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
 #pragma once
 
@@ -22,13 +22,13 @@
 #include <AzCore/std/containers/set.h>
 #include <AzCore/std/smart_ptr/enable_shared_from_this.h>
 #include <AzToolsFramework/Manipulators/ManipulatorBus.h>
-#include "ManipulatorSpace.h"
+#include <AzToolsFramework/Manipulators/ManipulatorSpace.h>
 
 namespace AzFramework
 {
     struct CameraState;
     class DebugDisplayRequests;
-}
+} // namespace AzFramework
 
 namespace AzToolsFramework
 {
@@ -46,9 +46,8 @@ namespace AzToolsFramework
 
     struct ManipulatorManagerState;
 
-    /// The base class for manipulators, providing interfaces for users of manipulators to talk to.
-    class BaseManipulator
-        : public AZStd::enable_shared_from_this<BaseManipulator>
+    //! The base class for manipulators, providing interfaces for users of manipulators to talk to.
+    class BaseManipulator : public AZStd::enable_shared_from_this<BaseManipulator>
     {
     public:
         AZ_CLASS_ALLOCATOR_DECL
@@ -61,139 +60,181 @@ namespace AzToolsFramework
 
         using EntityComponentIds = AZStd::unordered_set<AZ::EntityComponentIdPair>;
 
-        /// Callback for the event when the mouse pointer is over this manipulator and the left mouse button is pressed.
-        /// @param interaction It contains various mouse states when the event happens, as well as a ray shooting from the viewing camera through the mouse pointer.
-        /// @param rayIntersectionDistance The parameter value in the ray's explicit equation that represents the intersecting point on the target manipulator in world space.
-        /// @return Return true if OnLeftMouseDownImpl was attached and will be used.
+        //! Callback for the event when the mouse pointer is over this manipulator and the left mouse button is pressed.
+        //! @param interaction It contains various mouse states when the event happens, as well as a ray shooting from the viewing camera
+        //! through the mouse pointer.
+        //! @param rayIntersectionDistance The parameter value in the ray's explicit equation that represents the intersecting point on the
+        //! target manipulator in world space.
+        //! @return Return true if OnLeftMouseDownImpl was attached and will be used.
         bool OnLeftMouseDown(const ViewportInteraction::MouseInteraction& interaction, float rayIntersectionDistance);
 
-        /// Callback for the event when this manipulator is active and the left mouse button is released.
-        /// @param interaction It contains various mouse states when the event happens, as well as a ray shooting from the viewing camera through the mouse pointer.
+        //! Callback for the event when this manipulator is active and the left mouse button is released.
+        //! @param interaction It contains various mouse states when the event happens, as well as a ray shooting from the viewing camera
+        //! through the mouse pointer.
         void OnLeftMouseUp(const ViewportInteraction::MouseInteraction& interaction);
 
-        /// Callback for the event when the mouse pointer is over this manipulator and the right mouse button is pressed .
-        /// @param interaction It contains various mouse states when the event happens, as well as a ray shooting from the viewing camera through the mouse pointer.
-        /// @param rayIntersectionDistance The parameter value in the ray's explicit equation that represents the intersecting point on the target manipulator in world space.
-        /// @return Return true if OnRightMouseDownImpl was attached and will be used.
+        //! Callback for the event when the mouse pointer is over this manipulator and the right mouse button is pressed .
+        //! @param interaction It contains various mouse states when the event happens, as well as a ray shooting from the viewing camera
+        //! through the mouse pointer.
+        //! @param rayIntersectionDistance The parameter value in the ray's explicit equation that represents the intersecting point on the
+        //! target manipulator in world space.
+        //! @return Return true if OnRightMouseDownImpl was attached and will be used.
         bool OnRightMouseDown(const ViewportInteraction::MouseInteraction& interaction, float rayIntersectionDistance);
 
-        /// Callback for the event when this manipulator is active and the right mouse button is released.
-        /// @param interaction It contains various mouse states when the event happens, as well as a ray shooting from the viewing camera through the mouse pointer.
+        //! Callback for the event when this manipulator is active and the right mouse button is released.
+        //! @param interaction It contains various mouse states when the event happens, as well as a ray shooting from the viewing camera
+        //! through the mouse pointer.
         void OnRightMouseUp(const ViewportInteraction::MouseInteraction& interaction);
 
-        /// Callback for the event when this manipulator is active and the mouse is moved.
-        /// @param interaction It contains various mouse states when the event happens, as well as a ray shooting from the viewing camera through the mouse pointer.
+        //! Callback for the event when this manipulator is active and the mouse is moved.
+        //! @param interaction It contains various mouse states when the event happens, as well as a ray shooting from the viewing camera
+        //! through the mouse pointer.
         void OnMouseMove(const ViewportInteraction::MouseInteraction& interaction);
 
-        /// Callback for the event when this manipulator is active and the mouse wheel is scrolled.
-        /// @param interaction It contains various mouse states when the event happens, as well as a ray shooting from the viewing camera through the mouse pointer.
+        //! Callback for the event when this manipulator is active and the mouse wheel is scrolled.
+        //! @param interaction It contains various mouse states when the event happens, as well as a ray shooting from the viewing camera
+        //! through the mouse pointer.
         void OnMouseWheel(const ViewportInteraction::MouseInteraction& interaction);
 
-        /// This function changes the state indicating whether the manipulator is under the mouse pointer.
-        /// It is called in the event of OnMouseMove and OnMouseWheel only when there is no manipulator currently performing actions.
+        //! This function changes the state indicating whether the manipulator is under the mouse pointer.
+        //! It is called in the event of OnMouseMove and OnMouseWheel only when there is no manipulator currently performing actions.
         bool OnMouseOver(ManipulatorId manipulatorId, const ViewportInteraction::MouseInteraction& interaction);
 
-        /// Register itself to a manipulator manager so that it can receive various mouse events and perform manipulations.
-        /// @param managerId The id identifying a unique manipulator manager.
+        //! Register itself to a manipulator manager so that it can receive various mouse events and perform manipulations.
+        //! @param managerId The id identifying a unique manipulator manager.
         void Register(ManipulatorManagerId managerId);
 
-        /// Unregister itself from the manipulator manager it was registered with.
+        //! Unregister itself from the manipulator manager it was registered with.
         void Unregister();
 
-        /// Bounds will need to be recalculated next time we render.
+        //! Bounds will need to be recalculated next time we render.
         void SetBoundsDirty();
 
-        /// Is this manipulator currently registered with a manipulator manager.
+        //! Is this manipulator currently registered with a manipulator manager.
         bool Registered() const
         {
-            return m_manipulatorId != InvalidManipulatorId &&
-                m_manipulatorManagerId != InvalidManipulatorManagerId;
+            return m_manipulatorId != InvalidManipulatorId && m_manipulatorManagerId != InvalidManipulatorManagerId;
         }
 
-        /// Is the manipulator in the middle of an action (between mouse down and mouse up).
-        bool PerformingAction() const { return m_performingAction; }
+        //! Is the manipulator in the middle of an action (between mouse down and mouse up).
+        bool PerformingAction() const
+        {
+            return m_performingAction;
+        }
 
-        /// Is the mouse currently over the manipulator (intersecting manipulator bound).
-        bool MouseOver() const { return m_mouseOver; }
+        //! Is the mouse currently over the manipulator (intersecting manipulator bound).
+        bool MouseOver() const
+        {
+            return m_mouseOver;
+        }
 
-        /// The unique id of this manipulator.
-        ManipulatorId GetManipulatorId() const { return m_manipulatorId; }
+        //! The unique id of this manipulator.
+        ManipulatorId GetManipulatorId() const
+        {
+            return m_manipulatorId;
+        }
 
-        /// The unique id of the manager this manipulator was registered with.
-        ManipulatorManagerId GetManipulatorManagerId() const { return m_manipulatorManagerId; }
+        //! The unique id of the manager this manipulator was registered with.
+        ManipulatorManagerId GetManipulatorManagerId() const
+        {
+            return m_manipulatorManagerId;
+        }
 
-        /// Returns all EntityComponentIdPairs associated with this manipulator.
+        //! Returns all EntityComponentIdPairs associated with this manipulator.
         const EntityComponentIds& EntityComponentIdPairs() const
         {
             return m_entityComponentIdPairs;
         }
 
-        /// Add an entity and component the manipulator is responsible for.
+        //! Add an entity and component the manipulator is responsible for.
         void AddEntityComponentIdPair(const AZ::EntityComponentIdPair& entityComponentIdPair);
 
-        /// Remove an entity from being affected by this manipulator.
-        /// @note All components on this entity registered with the manipulator will be removed.
+        //! Remove an entity from being affected by this manipulator.
+        //! @note All components on this entity registered with the manipulator will be removed.
         EntityComponentIds::iterator RemoveEntityId(AZ::EntityId entityId);
 
-        /// Remove a specific component (via a EntityComponentIdPair) being affected by this manipulator.
+        //! Remove a specific component (via a EntityComponentIdPair) being affected by this manipulator.
         EntityComponentIds::iterator RemoveEntityComponentIdPair(const AZ::EntityComponentIdPair& entityComponentIdPair);
 
-        /// Is this entity currently being tracked by this manipulator.
+        //! Is this entity currently being tracked by this manipulator.
         bool HasEntityId(AZ::EntityId entityId) const;
 
-        /// Is this entity component pair currently being tracked by this manipulator.
+        //! Is this entity component pair currently being tracked by this manipulator.
         bool HasEntityComponentIdPair(const AZ::EntityComponentIdPair& entityComponentIdPair) const;
 
-        /// Forward a mouse over event in a case where we need the manipulator to immediately refresh.
-        /// @note Only call this when a mouse over event has just happened.
+        //! Forward a mouse over event in a case where we need the manipulator to immediately refresh.
+        //! @note Only call this when a mouse over event has just happened.
         void ForwardMouseOverEvent(const ViewportInteraction::MouseInteraction& interaction);
 
         static const AZ::Color s_defaultMouseOverColor;
 
     protected:
-        /// Protected constructor.
+        //! Protected constructor.
         BaseManipulator() = default;
 
-        /// Called when unregistering - users of manipulators should not call it directly.
+        //! Called when unregistering - users of manipulators should not call it directly.
         void Invalidate();
 
-        /// The implementation to override in a derived class for Invalidate.
-        virtual void InvalidateImpl() {}
+        //! The implementation to override in a derived class for Invalidate.
+        virtual void InvalidateImpl()
+        {
+        }
 
-        /// The implementation to override in a derived class for OnLeftMouseDown.
-        /// Note: When implementing this function you must also call AttachLeftMouseDownImpl to ensure
-        /// m_onLeftMouseDownImpl is set to OnLeftMouseDownImpl, otherwise it will not be called
-        virtual void OnLeftMouseDownImpl(
-            const ViewportInteraction::MouseInteraction& /*interaction*/, float /*rayIntersectionDistance*/) {}
-        void AttachLeftMouseDownImpl() { m_onLeftMouseDownImpl = &BaseManipulator::OnLeftMouseDownImpl; }
+        //! The implementation to override in a derived class for OnLeftMouseDown.
+        //! Note: When implementing this function you must also call AttachLeftMouseDownImpl to ensure
+        //! m_onLeftMouseDownImpl is set to OnLeftMouseDownImpl, otherwise it will not be called
+        virtual void OnLeftMouseDownImpl(const ViewportInteraction::MouseInteraction& /*interaction*/, float /*rayIntersectionDistance*/)
+        {
+        }
 
-        /// The implementation to override in a derived class for OnRightMouseDown.
-        /// Note: When implementing this function you must also call AttachRightMouseDownImpl to ensure
-        /// m_onRightMouseDownImpl is set to OnRightMouseDownImpl, otherwise it will not be called
-        virtual void OnRightMouseDownImpl(
-            const ViewportInteraction::MouseInteraction& /*interaction*/, float /*rayIntersectionDistance*/) {}
-        void AttachRightMouseDownImpl() { m_onRightMouseDownImpl = &BaseManipulator::OnRightMouseDownImpl; }
+        void AttachLeftMouseDownImpl()
+        {
+            m_onLeftMouseDownImpl = &BaseManipulator::OnLeftMouseDownImpl;
+        }
 
-        /// The implementation to override in a derived class for OnLeftMouseUp.
-        virtual void OnLeftMouseUpImpl(const ViewportInteraction::MouseInteraction& /*interaction*/) {}
+        //! The implementation to override in a derived class for OnRightMouseDown.
+        //! Note: When implementing this function you must also call AttachRightMouseDownImpl to ensure
+        //! m_onRightMouseDownImpl is set to OnRightMouseDownImpl, otherwise it will not be called
+        virtual void OnRightMouseDownImpl(const ViewportInteraction::MouseInteraction& /*interaction*/, float /*rayIntersectionDistance*/)
+        {
+        }
 
-        /// The implementation to override in a derived class for OnRightMouseUp.
-        virtual void OnRightMouseUpImpl(const ViewportInteraction::MouseInteraction& /*interaction*/) {}
+        void AttachRightMouseDownImpl()
+        {
+            m_onRightMouseDownImpl = &BaseManipulator::OnRightMouseDownImpl;
+        }
 
-        /// The implementation to override in a derived class for OnMouseMove.
-        virtual void OnMouseMoveImpl(const ViewportInteraction::MouseInteraction& /*interaction*/) {}
+        //! The implementation to override in a derived class for OnLeftMouseUp.
+        virtual void OnLeftMouseUpImpl(const ViewportInteraction::MouseInteraction& /*interaction*/)
+        {
+        }
 
-        /// The implementation to override in a derived class for OnMouseOver.
-        virtual void OnMouseOverImpl(
-            ManipulatorId /*manipulatorId*/, const ViewportInteraction::MouseInteraction& /*interaction*/) {}
+        //! The implementation to override in a derived class for OnRightMouseUp.
+        virtual void OnRightMouseUpImpl(const ViewportInteraction::MouseInteraction& /*interaction*/)
+        {
+        }
 
-        /// The implementation to override in a derived class for OnMouseWheel.
-        virtual void OnMouseWheelImpl(const ViewportInteraction::MouseInteraction& /*interaction*/) {}
+        //! The implementation to override in a derived class for OnMouseMove.
+        virtual void OnMouseMoveImpl(const ViewportInteraction::MouseInteraction& /*interaction*/)
+        {
+        }
 
-        /// The implementation to override in a derived class for SetBoundsDirty.
-        virtual void SetBoundsDirtyImpl() {}
+        //! The implementation to override in a derived class for OnMouseOver.
+        virtual void OnMouseOverImpl(ManipulatorId /*manipulatorId*/, const ViewportInteraction::MouseInteraction& /*interaction*/)
+        {
+        }
 
-        /// Rendering for the manipulator - it is recommended drawing be delegated to a ManipulatorView.
+        //! The implementation to override in a derived class for OnMouseWheel.
+        virtual void OnMouseWheelImpl(const ViewportInteraction::MouseInteraction& /*interaction*/)
+        {
+        }
+
+        //! The implementation to override in a derived class for SetBoundsDirty.
+        virtual void SetBoundsDirtyImpl()
+        {
+        }
+
+        //! Rendering for the manipulator - it is recommended drawing be delegated to a ManipulatorView.
         virtual void Draw(
             const ManipulatorManagerState& managerState,
             AzFramework::DebugDisplayRequests& debugDisplay,
@@ -202,39 +243,39 @@ namespace AzToolsFramework
 
     private:
         friend class ManipulatorManager;
-        AZStd::unordered_set<AZ::EntityComponentIdPair> m_entityComponentIdPairs; ///< The entities this manipulator is associated with.
+        AZStd::unordered_set<AZ::EntityComponentIdPair> m_entityComponentIdPairs; //!< The entities this manipulator is associated with.
 
-        ManipulatorId m_manipulatorId = InvalidManipulatorId; ///< The unique id of this manipulator.
-        ManipulatorManagerId m_manipulatorManagerId = InvalidManipulatorManagerId; ///< The manager this manipulator was registered with.
-        UndoSystem::URSequencePoint* m_undoBatch = nullptr; ///< Undo active while mouse is pressed.
-        bool m_performingAction = false; ///< After mouse down and before mouse up.
-        bool m_mouseOver = false; ///< Is the mouse pointer over the manipulator bound.
+        ManipulatorId m_manipulatorId = InvalidManipulatorId; //!< The unique id of this manipulator.
+        ManipulatorManagerId m_manipulatorManagerId = InvalidManipulatorManagerId; //!< The manager this manipulator was registered with.
+        UndoSystem::URSequencePoint* m_undoBatch = nullptr; //!< Undo active while mouse is pressed.
+        bool m_performingAction = false; //!< After mouse down and before mouse up.
+        bool m_mouseOver = false; //!< Is the mouse pointer over the manipulator bound.
 
-        /// Member function pointers to OnLeftMouseDownImpl and OnRightMouseDownImpl.
-        /// Set in AttachLeft/RightMouseDownImpl.
+        //! Member function pointers to OnLeftMouseDownImpl and OnRightMouseDownImpl.
+        //! Set in AttachLeft/RightMouseDownImpl.
         void (BaseManipulator::*m_onLeftMouseDownImpl)(
             const ViewportInteraction::MouseInteraction& interaction, float rayIntersectionDistance) = nullptr;
         void (BaseManipulator::*m_onRightMouseDownImpl)(
             const ViewportInteraction::MouseInteraction& interaction, float rayIntersectionDistance) = nullptr;
 
-        /// Update the mouseOver state for this manipulator.
+        //! Update the mouseOver state for this manipulator.
         void UpdateMouseOver(ManipulatorId manipulatorId);
 
-        /// Manage correctly ending the undo batch.
+        //! Manage correctly ending the undo batch.
         void EndUndoBatch();
 
-        /// Record an action as having started.
+        //! Record an action as having started.
         void BeginAction();
 
-        /// Record an action as having stopped.
+        //! Record an action as having stopped.
         void EndAction();
 
-        /// Let other systems (UI) know that a component property has been modified by a manipulator.
+        //! Let other systems (UI) know that a component property has been modified by a manipulator.
         void NotifyEntityComponentPropertyChanged();
     };
 
-    /// Base class to be used when composing aggregate manipulator types - wraps some
-    /// common functionality all manipulators need.
+    //! Base class to be used when composing aggregate manipulator types - wraps some
+    //! common functionality all manipulators need.
     class Manipulators
     {
     public:
@@ -249,8 +290,10 @@ namespace AzToolsFramework
         bool PerformingAction();
         bool Registered();
 
-        /// Refresh the Manipulator and/or View based on the current view position.
-        virtual void RefreshView(const AZ::Vector3& /*worldViewPosition*/) {}
+        //! Refresh the Manipulator and/or View based on the current view position.
+        virtual void RefreshView(const AZ::Vector3& /*worldViewPosition*/)
+        {
+        }
 
         const AZ::Transform& GetLocalTransform() const;
         const AZ::Transform& GetSpace() const;
@@ -262,39 +305,59 @@ namespace AzToolsFramework
         void SetNonUniformScale(const AZ::Vector3& nonUniformScale);
 
     protected:
-        /// Common processing for base manipulator type - Implement for all
-        /// individual manipulators used in an aggregate manipulator.
+        //! Common processing for base manipulator type - Implement for all
+        //! individual manipulators used in an aggregate manipulator.
         virtual void ProcessManipulators(const AZStd::function<void(BaseManipulator*)>&) = 0;
 
-        ///@{
-        /// Allows implementers to perform additional logic when updating the location of the manipulator group.
-        virtual void SetSpaceImpl([[maybe_unused]] const AZ::Transform& worldFromLocal) {}
-        virtual void SetLocalTransformImpl([[maybe_unused]] const AZ::Transform& localTransform) {}
-        virtual void SetLocalPositionImpl([[maybe_unused]] const AZ::Vector3& localPosition) {}
-        virtual void SetLocalOrientationImpl([[maybe_unused]] const AZ::Quaternion& localOrientation) {}
-        virtual void SetNonUniformScaleImpl([[maybe_unused]] const AZ::Vector3& nonUniformScale) {}
-        ///@}
+        //!@{
+        //! Allows implementers to perform additional logic when updating the location of the manipulator group.
+        virtual void SetSpaceImpl([[maybe_unused]] const AZ::Transform& worldFromLocal)
+        {
+        }
 
-        ManipulatorSpaceWithLocalTransform m_manipulatorSpaceWithLocalTransform; ///< The space and local transform for the manipulators.
+        virtual void SetLocalTransformImpl([[maybe_unused]] const AZ::Transform& localTransform)
+        {
+        }
+
+        virtual void SetLocalPositionImpl([[maybe_unused]] const AZ::Vector3& localPosition)
+        {
+        }
+
+        virtual void SetLocalOrientationImpl([[maybe_unused]] const AZ::Quaternion& localOrientation)
+        {
+        }
+
+        virtual void SetNonUniformScaleImpl([[maybe_unused]] const AZ::Vector3& nonUniformScale)
+        {
+        }
+        //!@}
+
+        ManipulatorSpaceWithLocalTransform m_manipulatorSpaceWithLocalTransform; //!< The space and local transform for the manipulators.
     };
 
     namespace Internal
     {
-        /// This helper function calculates the intersecting point between a ray and a plane.
-        /// @param rayOrigin                     The origin of the ray to test.
-        /// @param rayDirection                  The direction of the ray to test.
-        /// @param maxRayLength
-        /// @param pointOnPlane                  A point on the plane.
-        /// @param planeNormal                   The normal vector of the plane.
-        /// @param[out] resultIntersectingPoint  This stores the result intersecting point. It will be left unchanged
-        ///                                      if there is no intersection between the ray and the plane.
-        /// @return                              Was there an intersection
-        bool CalculateRayPlaneIntersectingPoint(const AZ::Vector3& rayOrigin, const AZ::Vector3& rayDirection,
-            const AZ::Vector3& pointOnPlane, const AZ::Vector3& planeNormal, AZ::Vector3& resultIntersectingPoint);
+        //! This helper function calculates the intersecting point between a ray and a plane.
+        //! @param rayOrigin                     The origin of the ray to test.
+        //! @param rayDirection                  The direction of the ray to test.
+        //! @param maxRayLength                  The maximum length of the ray to test.
+        //! @param pointOnPlane                  A point on the plane.
+        //! @param planeNormal                   The normal vector of the plane.
+        //! @param[out] resultIntersectingPoint  This stores the result intersecting point. It will be left unchanged
+        //!                                      if there is no intersection between the ray and the plane.
+        //! @return                              Was there an intersection
+        bool CalculateRayPlaneIntersectingPoint(
+            const AZ::Vector3& rayOrigin,
+            const AZ::Vector3& rayDirection,
+            const AZ::Vector3& pointOnPlane,
+            const AZ::Vector3& planeNormal,
+            AZ::Vector3& resultIntersectingPoint);
 
-        /// Returns startLocalHitPosition if currentLocalHitPosition is further away than the camera's far clip plane.
+        //! Returns startLocalHitPosition if currentLocalHitPosition is further away than the camera's far clip plane.
         AZ::Vector3 TryConstrainHitPositionToView(
-            const AZ::Vector3& currentLocalHitPosition, const AZ::Vector3& startLocalHitPosition,
-            const AZ::Transform& localFromWorld, const AzFramework::CameraState& cameraState);
-    }
+            const AZ::Vector3& currentLocalHitPosition,
+            const AZ::Vector3& startLocalHitPosition,
+            const AZ::Transform& localFromWorld,
+            const AzFramework::CameraState& cameraState);
+    } // namespace Internal
 } // namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/BoxManipulatorRequestBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/BoxManipulatorRequestBus.h
index 05da73fa20..69920f5f52 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/BoxManipulatorRequestBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/BoxManipulatorRequestBus.h
@@ -1,14 +1,14 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
 #pragma once
 
@@ -21,31 +21,30 @@ namespace AZ
 
 namespace AzToolsFramework
 {
-    /// Interface for handling box manipulator requests.
-    /// Used by \ref BoxComponentMode.
-    class BoxManipulatorRequests
-        : public AZ::EntityComponentBus
+    //! Interface for handling box manipulator requests.
+    //! Used by \ref BoxComponentMode.
+    class BoxManipulatorRequests : public AZ::EntityComponentBus
     {
     public:
-        /// Get the X/Y/Z dimensions of the box shape/collider.
+        //! Get the X/Y/Z dimensions of the box shape/collider.
         virtual AZ::Vector3 GetDimensions() = 0;
-        /// Set the X/Y/Z dimensions of the box shape/collider.
+        //! Set the X/Y/Z dimensions of the box shape/collider.
         virtual void SetDimensions(const AZ::Vector3& dimensions) = 0;
-        /// Get the transform of the box shape/collider.
-        /// This is used by \ref BoxComponentMode instead of the \ref \AZ::TransformBus
-        /// because a collider may have an additional translation/orientation offset from
-        /// the Entity transform.
+        //! Get the transform of the box shape/collider.
+        //! This is used by \ref BoxComponentMode instead of the \ref \AZ::TransformBus
+        //! because a collider may have an additional translation/orientation offset from
+        //! the Entity transform.
         virtual AZ::Transform GetCurrentTransform() = 0;
-        /// Get the scale currently applied to the box.
-        /// With the Box Shape, the largest x/y/z component is taken
-        /// so scale is always uniform, with colliders the scale may
-        /// be different per component.
+        //! Get the scale currently applied to the box.
+        //! With the Box Shape, the largest x/y/z component is taken
+        //! so scale is always uniform, with colliders the scale may
+        //! be different per component.
         virtual AZ::Vector3 GetBoxScale() = 0;
 
     protected:
         ~BoxManipulatorRequests() = default;
     };
 
-    /// Type to inherit to implement BoxManipulatorRequests
+    //! Type to inherit to implement BoxManipulatorRequests
     using BoxManipulatorRequestBus = AZ::EBus<BoxManipulatorRequests>;
 } // namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/EditorVertexSelection.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/EditorVertexSelection.cpp
index 55a8464ba6..c8be488c91 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/EditorVertexSelection.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/EditorVertexSelection.cpp
@@ -1,14 +1,14 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
 #include "EditorVertexSelection.h"
 
@@ -16,10 +16,10 @@
 #include <AzCore/Math/VertexContainerInterface.h>
 #include <AzCore/std/sort.h>
 #include <AzToolsFramework/ComponentMode/EditorComponentModeBus.h>
-#include <AzToolsFramework/Manipulators/PlanarManipulator.h>
 #include <AzToolsFramework/Manipulators/LinearManipulator.h>
-#include <AzToolsFramework/Manipulators/ManipulatorView.h>
 #include <AzToolsFramework/Manipulators/ManipulatorSnapping.h>
+#include <AzToolsFramework/Manipulators/ManipulatorView.h>
+#include <AzToolsFramework/Manipulators/PlanarManipulator.h>
 #include <AzToolsFramework/UI/UICore/WidgetHelpers.h>
 #include <AzToolsFramework/Viewport/ViewportMessages.h>
 #include <AzToolsFramework/ViewportSelection/EditorSelectionUtil.h>
@@ -37,7 +37,7 @@ using Vertex3LookupReverseIter =
 
 namespace std
 {
-    template <>
+    template<>
     struct iterator_traits<Vertex2LookupReverseIter>
     {
         using difference_type = typename Vertex2LookupReverseIter::difference_type;
@@ -47,7 +47,7 @@ namespace std
         using reference = typename Vertex2LookupReverseIter::reference;
     };
 
-    template <>
+    template<>
     struct iterator_traits<Vertex3LookupReverseIter>
     {
         using difference_type = typename Vertex3LookupReverseIter::difference_type;
@@ -56,7 +56,7 @@ namespace std
         using pointer = typename Vertex3LookupReverseIter::pointer;
         using reference = typename Vertex3LookupReverseIter::reference;
     };
-}
+} // namespace std
 
 namespace AzToolsFramework
 {
@@ -73,14 +73,11 @@ namespace AzToolsFramework
         OnEntityComponentPropertyChanged(entityComponentIdPair);
 
         // ensure property grid values are refreshed
-        ToolsApplicationNotificationBus::Broadcast(
-            &ToolsApplicationNotificationBus::Events::InvalidatePropertyDisplay,
-            Refresh_EntireTree);
+        ToolsApplicationNotificationBus::Broadcast(&ToolsApplicationNotificationBus::Events::InvalidatePropertyDisplay, Refresh_EntireTree);
     }
 
     template<typename Vertex>
-    bool EditorVertexSelectionBase<Vertex>::HandleMouse(
-        const ViewportInteraction::MouseInteractionEvent& mouseInteraction)
+    bool EditorVertexSelectionBase<Vertex>::HandleMouse(const ViewportInteraction::MouseInteractionEvent& mouseInteraction)
     {
         m_editorBoxSelect.HandleMouseInteraction(mouseInteraction);
 
@@ -115,18 +112,17 @@ namespace AzToolsFramework
     }
 
     template<typename Vertex>
-    void EditorVertexSelectionBase<Vertex>::SnapVerticesToTerrain(
-        const ViewportInteraction::MouseInteractionEvent& mouseInteraction)
+    void EditorVertexSelectionBase<Vertex>::SnapVerticesToTerrain(const ViewportInteraction::MouseInteractionEvent& mouseInteraction)
     {
         ScopedUndoBatch surfaceSnapUndo("Snap to Surface");
         ScopedUndoBatch::MarkEntityDirty(GetEntityId());
 
         const int viewportId = mouseInteraction.m_mouseInteraction.m_interactionId.m_viewportId;
         // get unsnapped terrain position (world space)
-        AZ::Vector3 worldSurfacePosition = AZ::Vector3::CreateZero();;
+        AZ::Vector3 worldSurfacePosition = AZ::Vector3::CreateZero();
+        ;
         ViewportInteraction::MainEditorViewportInteractionRequestBus::EventResult(
-            worldSurfacePosition, viewportId,
-            &ViewportInteraction::MainEditorViewportInteractionRequestBus::Events::PickTerrain,
+            worldSurfacePosition, viewportId, &ViewportInteraction::MainEditorViewportInteractionRequestBus::Events::PickTerrain,
             mouseInteraction.m_mouseInteraction.m_mousePick.m_screenCoordinates);
 
         AZ::Transform worldFromLocal;
@@ -136,8 +132,7 @@ namespace AzToolsFramework
         // convert to local space - snap if enabled
         const GridSnapParameters gridSnapParams = GridSnapSettings(viewportId);
         const AZ::Vector3 localFinalSurfacePosition = gridSnapParams.m_gridSnap
-            ? CalculateSnappedTerrainPosition(
-                worldSurfacePosition, worldFromLocal, viewportId, gridSnapParams.m_gridSize)
+            ? CalculateSnappedTerrainPosition(worldSurfacePosition, worldFromLocal, viewportId, gridSnapParams.m_gridSize)
             : localFromWorld.TransformPoint(worldSurfacePosition);
 
         SetSelectedPosition(localFinalSurfacePosition);
@@ -145,17 +140,16 @@ namespace AzToolsFramework
         OnEntityComponentPropertyChanged(GetEntityComponentIdPair());
 
         // ensure property grid values are refreshed
-        ToolsApplicationNotificationBus::Broadcast(
-            &ToolsApplicationNotificationBus::Events::InvalidatePropertyDisplay,
-            Refresh_Values);
+        ToolsApplicationNotificationBus::Broadcast(&ToolsApplicationNotificationBus::Events::InvalidatePropertyDisplay, Refresh_Values);
     }
 
-    /// Iterate over all vertices currently associated with the translation manipulator and update their
-    /// positions by taking their starting positions and modifying them by an offset.
+    // iterate over all vertices currently associated with the translation manipulator and update their
+    // positions by taking their starting positions and modifying them by an offset.
     template<typename Vertex>
     void EditorVertexSelectionBase<Vertex>::UpdateManipulatorsAndVerticesFromOffset(
         IndexedTranslationManipulator<Vertex>& translationManipulator,
-        const AZ::Vector3& localManipulatorStartPosition, const AZ::Vector3& localManipulatorOffset)
+        const AZ::Vector3& localManipulatorStartPosition,
+        const AZ::Vector3& localManipulatorOffset)
     {
         AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
 
@@ -164,22 +158,19 @@ namespace AzToolsFramework
         AZ::FixedVerticesRequestBus<Vertex>::Bind(fixedVertices, GetEntityId());
 
         translationManipulator.Process(
-            [this, localManipulatorOffset, fixedVertices]
-            (typename IndexedTranslationManipulator<Vertex>::VertexLookup& vertex)
-        {
-            vertex.m_offset = AZ::AdaptVertexIn<Vertex>(localManipulatorOffset);
+            [this, localManipulatorOffset, fixedVertices](typename IndexedTranslationManipulator<Vertex>::VertexLookup& vertex)
+            {
+                vertex.m_offset = AZ::AdaptVertexIn<Vertex>(localManipulatorOffset);
 
-            bool updated = false;
-            const Vertex vertexPosition = vertex.m_start + vertex.m_offset;
-            AZ::FixedVerticesRequestBus<Vertex>::EventResult(
-                updated, fixedVertices, &AZ::FixedVerticesRequestBus<Vertex>::Handler::UpdateVertex,
-                vertex.m_index, vertexPosition);
+                bool updated = false;
+                const Vertex vertexPosition = vertex.m_start + vertex.m_offset;
+                AZ::FixedVerticesRequestBus<Vertex>::EventResult(
+                    updated, fixedVertices, &AZ::FixedVerticesRequestBus<Vertex>::Handler::UpdateVertex, vertex.m_index, vertexPosition);
 
-            m_selectionManipulators[vertex.m_index]->SetLocalPosition(AZ::AdaptVertexOut(vertexPosition));
-        });
+                m_selectionManipulators[vertex.m_index]->SetLocalPosition(AZ::AdaptVertexOut(vertexPosition));
+            });
 
-        m_translationManipulator->m_manipulator.SetLocalPosition(
-            localManipulatorStartPosition + localManipulatorOffset);
+        m_translationManipulator->m_manipulator.SetLocalPosition(localManipulatorStartPosition + localManipulatorOffset);
 
         // after vertex positions have changed, anything else which relies on their positions may update
         if (m_onVertexPositionsUpdated)
@@ -188,11 +179,10 @@ namespace AzToolsFramework
         }
     }
 
-    /// In OnMouseDown for various manipulators (linear/planar/surface), ensure we record the vertex starting position
-    /// for each vertex associated with the translation manipulator to use with offset calculations when updating.
+    // in OnMouseDown for various manipulators (linear/planar/surface), ensure we record the vertex starting position
+    // for each vertex associated with the translation manipulator to use with offset calculations when updating.
     template<typename Vertex>
-    void InitializeVertexLookup(
-        IndexedTranslationManipulator<Vertex>& translationManipulator, const AZ::EntityId entityId)
+    void InitializeVertexLookup(IndexedTranslationManipulator<Vertex>& translationManipulator, const AZ::EntityId entityId)
     {
         AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
 
@@ -201,29 +191,28 @@ namespace AzToolsFramework
         AZ::FixedVerticesRequestBus<Vertex>::Bind(fixedVertices, entityId);
 
         translationManipulator.Process(
-            [fixedVertices]
-            (typename IndexedTranslationManipulator<Vertex>::VertexLookup& vertexLookup)
-        {
-            Vertex vertex;
-            bool found = false;
-            AZ::FixedVerticesRequestBus<Vertex>::EventResult(
-                found, fixedVertices, &AZ::FixedVerticesRequestBus<Vertex>::Handler::GetVertex,
-                vertexLookup.m_index, vertex);
-
-            if (found)
+            [fixedVertices](typename IndexedTranslationManipulator<Vertex>::VertexLookup& vertexLookup)
             {
-                vertexLookup.m_start = vertex;
-                vertexLookup.m_offset = Vertex::CreateZero();
-            }
-        });
+                Vertex vertex;
+                bool found = false;
+                AZ::FixedVerticesRequestBus<Vertex>::EventResult(
+                    found, fixedVertices, &AZ::FixedVerticesRequestBus<Vertex>::Handler::GetVertex, vertexLookup.m_index, vertex);
+
+                if (found)
+                {
+                    vertexLookup.m_start = vertex;
+                    vertexLookup.m_offset = Vertex::CreateZero();
+                }
+            });
     }
 
-    /// Create a translation manipulator for a specific vertex and setup its corresponding callbacks etc.
+    // create a translation manipulator for a specific vertex and setup its corresponding callbacks etc.
     template<typename Vertex>
     void EditorVertexSelectionBase<Vertex>::CreateTranslationManipulator(
         const AZ::EntityComponentIdPair& entityComponentIdPair,
         const ManipulatorManagerId managerId,
-        const Vertex& vertex, size_t vertexIndex)
+        const Vertex& vertex,
+        size_t vertexIndex)
     {
         AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
 
@@ -250,65 +239,65 @@ namespace AzToolsFramework
         // linear manipulator callbacks
         m_translationManipulator->m_manipulator.InstallLinearManipulatorMouseDownCallback(
             [this]([[maybe_unused]] const LinearManipulator::Action& action)
-        {
-            BeginBatchMovement();
-            InitializeVertexLookup(*m_translationManipulator, GetEntityId());
-        });
+            {
+                BeginBatchMovement();
+                InitializeVertexLookup(*m_translationManipulator, GetEntityId());
+            });
 
         m_translationManipulator->m_manipulator.InstallLinearManipulatorMouseMoveCallback(
             [this](const LinearManipulator::Action& action)
-        {
-            UpdateManipulatorsAndVerticesFromOffset(
-                *m_translationManipulator, action.m_start.m_localPosition, action.LocalPositionOffset());
-        });
+            {
+                UpdateManipulatorsAndVerticesFromOffset(
+                    *m_translationManipulator, action.m_start.m_localPosition, action.LocalPositionOffset());
+            });
 
         m_translationManipulator->m_manipulator.InstallLinearManipulatorMouseUpCallback(
             [this]([[maybe_unused]] const LinearManipulator::Action& action)
-        {
-            EndBatchMovement();
-        });
+            {
+                EndBatchMovement();
+            });
 
         // planar manipulator callbacks
         m_translationManipulator->m_manipulator.InstallPlanarManipulatorMouseDownCallback(
             [this]([[maybe_unused]] const PlanarManipulator::Action& action)
-        {
-            BeginBatchMovement();
-            InitializeVertexLookup(*m_translationManipulator, GetEntityId());
-        });
+            {
+                BeginBatchMovement();
+                InitializeVertexLookup(*m_translationManipulator, GetEntityId());
+            });
 
         m_translationManipulator->m_manipulator.InstallPlanarManipulatorMouseMoveCallback(
             [this](const PlanarManipulator::Action& action)
-        {
-            UpdateManipulatorsAndVerticesFromOffset(
-                *m_translationManipulator, action.m_start.m_localPosition, action.LocalPositionOffset());
-        });
+            {
+                UpdateManipulatorsAndVerticesFromOffset(
+                    *m_translationManipulator, action.m_start.m_localPosition, action.LocalPositionOffset());
+            });
 
         m_translationManipulator->m_manipulator.InstallPlanarManipulatorMouseUpCallback(
             [this]([[maybe_unused]] const PlanarManipulator::Action& action)
-        {
-            EndBatchMovement();
-        });
+            {
+                EndBatchMovement();
+            });
 
         // surface manipulator callbacks
         m_translationManipulator->m_manipulator.InstallSurfaceManipulatorMouseDownCallback(
             [this]([[maybe_unused]] const SurfaceManipulator::Action& action)
-        {
-            BeginBatchMovement();
-            InitializeVertexLookup(*m_translationManipulator, GetEntityId());
-        });
+            {
+                BeginBatchMovement();
+                InitializeVertexLookup(*m_translationManipulator, GetEntityId());
+            });
 
         m_translationManipulator->m_manipulator.InstallSurfaceManipulatorMouseMoveCallback(
             [this](const SurfaceManipulator::Action& action)
-        {
-            UpdateManipulatorsAndVerticesFromOffset(
-                *m_translationManipulator, action.m_start.m_localPosition, action.LocalPositionOffset());
-        });
+            {
+                UpdateManipulatorsAndVerticesFromOffset(
+                    *m_translationManipulator, action.m_start.m_localPosition, action.LocalPositionOffset());
+            });
 
         m_translationManipulator->m_manipulator.InstallSurfaceManipulatorMouseUpCallback(
             [this]([[maybe_unused]] const SurfaceManipulator::Action& action)
-        {
-            EndBatchMovement();
-        });
+            {
+                EndBatchMovement();
+            });
 
         // register the m_translation manipulator so it appears where the selection manipulator previously was
         m_translationManipulator->m_manipulator.Register(managerId);
@@ -330,9 +319,9 @@ namespace AzToolsFramework
         AZStd::transform(
             vertexLookups.begin(), vertexLookups.end(), AZStd::back_inserter(vertexIndices),
             [](const typename IndexedTranslationManipulator<Vertex>::VertexLookup& vertexLookup)
-        {
-            return vertexLookup.m_index;
-        });
+            {
+                return vertexLookup.m_index;
+            });
 
         return vertexIndices;
     }
@@ -348,12 +337,13 @@ namespace AzToolsFramework
         bool m_additive = true; // is the box select adding or removing things from the selection
     };
 
-
     template<typename Vertex>
     void DoBoxSelect(
-        const AZ::EntityId entityId, BoxSelectData& boxSelectData,
+        const AZ::EntityId entityId,
+        BoxSelectData& boxSelectData,
         const ViewportInteraction::KeyboardModifiers keyboardModifiers,
-        const int viewportId, const EditorBoxSelect& editorBoxSelect,
+        const int viewportId,
+        const EditorBoxSelect& editorBoxSelect,
         const AZStd::vector<AZStd::shared_ptr<SelectionManipulator>>& selectionManipulators)
     {
         AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
@@ -384,8 +374,7 @@ namespace AzToolsFramework
         if (editorBoxSelect.BoxRegion())
         {
             AZ::Transform worldFromLocal;
-            AZ::TransformBus::EventResult(
-                worldFromLocal, entityId, &AZ::TransformBus::Events::GetWorldTM);
+            AZ::TransformBus::EventResult(worldFromLocal, entityId, &AZ::TransformBus::Events::GetWorldTM);
 
             // bind FixedVerticesRequestBus for improved performance
             typename AZ::FixedVerticesRequestBus<Vertex>::BusPtr fixedVertices;
@@ -396,8 +385,7 @@ namespace AzToolsFramework
                 Vertex localVertex;
                 bool found = false;
                 AZ::FixedVerticesRequestBus<Vertex>::EventResult(
-                    found, fixedVertices, &AZ::FixedVerticesRequestBus<Vertex>::Handler::GetVertex,
-                    vertexIndex, localVertex);
+                    found, fixedVertices, &AZ::FixedVerticesRequestBus<Vertex>::Handler::GetVertex, vertexIndex, localVertex);
 
                 const AZ::Vector3 worldVertex = worldFromLocal.TransformPoint(AZ::AdaptVertexOut<Vertex>(localVertex));
                 const AzFramework::ScreenPoint screenPosition = GetScreenPosition(viewportId, worldVertex);
@@ -406,8 +394,8 @@ namespace AzToolsFramework
                 if (editorBoxSelect.BoxRegion()->contains(ViewportInteraction::QPointFromScreenPoint(screenPosition)))
                 {
                     // see if vertexIndex is in active selection
-                    auto vertexIt = AZStd::find(
-                        boxSelectData.m_activeSelection.begin(), boxSelectData.m_activeSelection.end(), vertexIndex);
+                    auto vertexIt =
+                        AZStd::find(boxSelectData.m_activeSelection.begin(), boxSelectData.m_activeSelection.end(), vertexIndex);
 
                     if (!keyboardModifiers.Ctrl())
                     {
@@ -437,8 +425,8 @@ namespace AzToolsFramework
                 else
                 {
                     // not in box region - see if vertexIndex is in delta selection
-                    auto vertexItDelta = AZStd::find(
-                        boxSelectData.m_deltaSelection.begin(), boxSelectData.m_deltaSelection.end(), vertexIndex);
+                    auto vertexItDelta =
+                        AZStd::find(boxSelectData.m_deltaSelection.begin(), boxSelectData.m_deltaSelection.end(), vertexIndex);
 
                     // if we find the vertex in the delta selection
                     if (vertexItDelta != boxSelectData.m_deltaSelection.end())
@@ -451,8 +439,8 @@ namespace AzToolsFramework
                             boxSelectData.m_deltaSelection.erase(vertexItDelta);
 
                             // remove the vertex from the active selection as well
-                            auto vertexItStart = AZStd::find(
-                                boxSelectData.m_activeSelection.begin(), boxSelectData.m_activeSelection.end(), vertexIndex);
+                            auto vertexItStart =
+                                AZStd::find(boxSelectData.m_activeSelection.begin(), boxSelectData.m_activeSelection.end(), vertexIndex);
 
                             if (vertexItStart != boxSelectData.m_activeSelection.end())
                             {
@@ -467,8 +455,8 @@ namespace AzToolsFramework
                             boxSelectData.m_deltaSelection.erase(vertexItDelta);
 
                             // also add it back to the active selection
-                            auto vertexItStart = AZStd::find(
-                                boxSelectData.m_activeSelection.begin(), boxSelectData.m_activeSelection.end(), vertexIndex);
+                            auto vertexItStart =
+                                AZStd::find(boxSelectData.m_activeSelection.begin(), boxSelectData.m_activeSelection.end(), vertexIndex);
 
                             if (vertexItStart == boxSelectData.m_activeSelection.end())
                             {
@@ -491,7 +479,8 @@ namespace AzToolsFramework
 
     template<typename Vertex>
     void EditorVertexSelectionBase<Vertex>::Create(
-        const AZ::EntityComponentIdPair& entityComponentIdPair, const ManipulatorManagerId managerId,
+        const AZ::EntityComponentIdPair& entityComponentIdPair,
+        const ManipulatorManagerId managerId,
         AZStd::unique_ptr<HoverSelection> hoverSelection,
         const TranslationManipulators::Dimensions dimensions,
         const TranslationManipulatorConfiguratorFn translationManipulatorConfigurator)
@@ -509,8 +498,7 @@ namespace AzToolsFramework
         AZ::FixedVerticesRequestBus<Vertex>::Bind(fixedVertices, GetEntityId());
 
         size_t vertexCount = 0;
-        AZ::FixedVerticesRequestBus<Vertex>::EventResult(
-            vertexCount, fixedVertices, &AZ::FixedVerticesRequestBus<Vertex>::Handler::Size);
+        AZ::FixedVerticesRequestBus<Vertex>::EventResult(vertexCount, fixedVertices, &AZ::FixedVerticesRequestBus<Vertex>::Handler::Size);
 
         m_selectionManipulators.reserve(vertexCount);
         // initialize manipulators for all spline vertices
@@ -519,12 +507,10 @@ namespace AzToolsFramework
             Vertex vertex;
             bool found = false;
             AZ::FixedVerticesRequestBus<Vertex>::EventResult(
-                found, fixedVertices, &AZ::FixedVerticesRequestBus<Vertex>::Handler::GetVertex,
-                vertexIndex, vertex);
+                found, fixedVertices, &AZ::FixedVerticesRequestBus<Vertex>::Handler::GetVertex, vertexIndex, vertex);
 
-            m_selectionManipulators.push_back(SelectionManipulator::MakeShared(
-                WorldFromLocalWithUniformScale(GetEntityId()),
-                GetNonUniformScale(GetEntityId())));
+            m_selectionManipulators.push_back(
+                SelectionManipulator::MakeShared(WorldFromLocalWithUniformScale(GetEntityId()), GetNonUniformScale(GetEntityId())));
             const auto& selectionManipulator = m_selectionManipulators.back();
 
             selectionManipulator->Register(managerId);
@@ -539,156 +525,153 @@ namespace AzToolsFramework
 
         m_editorBoxSelect.InstallLeftMouseDown(
             [this, vertexBoxSelectData](const ViewportInteraction::MouseInteractionEvent& /*mouseInteraction*/)
-        {
-            // grab currently selected entities (the starting selection)
-            vertexBoxSelectData->m_startSelection = m_translationManipulator
-                ? MapFromLookupsToIndices<Vertex>(m_translationManipulator->m_vertices)
-                : AZStd::vector<AZ::u64>();
+            {
+                // grab currently selected entities (the starting selection)
+                vertexBoxSelectData->m_startSelection = m_translationManipulator
+                    ? MapFromLookupsToIndices<Vertex>(m_translationManipulator->m_vertices)
+                    : AZStd::vector<AZ::u64>();
 
-            // active selection is the same as start selection on mouse down
-            vertexBoxSelectData->m_activeSelection = vertexBoxSelectData->m_startSelection;
+                // active selection is the same as start selection on mouse down
+                vertexBoxSelectData->m_activeSelection = vertexBoxSelectData->m_startSelection;
 
-            size_t size = 0;
-            AZ::FixedVerticesRequestBus<Vertex>::EventResult(
-                size, GetEntityId(), &AZ::FixedVerticesRequestBus<Vertex>::Handler::Size);
+                size_t size = 0;
+                AZ::FixedVerticesRequestBus<Vertex>::EventResult(size, GetEntityId(), &AZ::FixedVerticesRequestBus<Vertex>::Handler::Size);
 
-            // populate vector of all indices in container to compare against
-            vertexBoxSelectData->m_all.resize(size);
-            std::iota(vertexBoxSelectData->m_all.begin(), vertexBoxSelectData->m_all.end(), static_cast<AZ::u64>(0));
-        });
+                // populate vector of all indices in container to compare against
+                vertexBoxSelectData->m_all.resize(size);
+                std::iota(vertexBoxSelectData->m_all.begin(), vertexBoxSelectData->m_all.end(), static_cast<AZ::u64>(0));
+            });
 
         m_editorBoxSelect.InstallMouseMove(
             [this, vertexBoxSelectData](const ViewportInteraction::MouseInteractionEvent& mouseInteraction)
-        {
-            DoBoxSelect<Vertex>(
-                GetEntityId(), *vertexBoxSelectData, mouseInteraction.m_mouseInteraction.m_keyboardModifiers,
-                mouseInteraction.m_mouseInteraction.m_interactionId.m_viewportId,
-                m_editorBoxSelect, m_selectionManipulators);
-        });
-
-        m_editorBoxSelect.InstallLeftMouseUp([this, vertexBoxSelectData]()
-        {
-            if (vertexBoxSelectData->m_additive)
             {
-                // bind FixedVerticesRequestBus for improved performance
-                typename AZ::FixedVerticesRequestBus<Vertex>::BusPtr fixedVertices;
-                AZ::FixedVerticesRequestBus<Vertex>::Bind(fixedVertices, GetEntityId());
+                DoBoxSelect<Vertex>(
+                    GetEntityId(), *vertexBoxSelectData, mouseInteraction.m_mouseInteraction.m_keyboardModifiers,
+                    mouseInteraction.m_mouseInteraction.m_interactionId.m_viewportId, m_editorBoxSelect, m_selectionManipulators);
+            });
 
-                const AZ::EntityComponentIdPair entityComponentIdPair = m_entityComponentIdPair;
-                for (size_t vertexIndex : vertexBoxSelectData->m_deltaSelection)
-                {
-                    Vertex vertex;
-                    bool found = false;
-                    AZ::FixedVerticesRequestBus<Vertex>::EventResult(
-                        found, fixedVertices, &AZ::FixedVerticesRequestBus<Vertex>::Handler::GetVertex,
-                        vertexIndex, vertex);
-
-                    // if we already have a translation manipulator, add additional vertices to it
-                    if (m_translationManipulator)
-                    {
-                        // otherwise add the new selected vertex
-                        m_translationManipulator->m_vertices.push_back(
-                            typename IndexedTranslationManipulator<Vertex>::VertexLookup{ vertex, Vertex::CreateZero(), vertexIndex });
-                    }
-                    else
-                    {
-                        // create a new translation manipulator if one did not already exist with the first vertex
-                        CreateTranslationManipulator(entityComponentIdPair, m_manipulatorManagerId, vertex, vertexIndex);
-                        // default to ensuring selection manipulators are 'selected'
-                        m_selectionManipulators[vertexIndex]->Select();
-                    }
-                }
-            }
-            else
-            {
-                // removing vertices with an active translation manipulator
-                if (m_translationManipulator)
-                {
-                    // iterate through all delta vertices (ones that were either
-                    // added or removed during selection) and remove them
-                    for (size_t vertexIndex : vertexBoxSelectData->m_deltaSelection)
-                    {
-                        auto vertexIt = AZStd::find_if(
-                            m_translationManipulator->m_vertices.begin(), m_translationManipulator->m_vertices.end(),
-                            [vertexIndex](const auto& vertexLookup)
-                        {
-                            return vertexLookup.m_index == vertexIndex;
-                        });
-
-                        // remove vertex from translation manipulator
-                        if (vertexIt != m_translationManipulator->m_vertices.end())
-                        {
-                            m_translationManipulator->m_vertices.erase(vertexIt);
-
-                            // ensure it is registered to receive input and draw
-                            if (!m_selectionManipulators[vertexIndex]->Registered())
-                            {
-                                m_selectionManipulators[vertexIndex]->Register(m_manipulatorManagerId);
-                            }
-                        }
-                    }
-
-                    // if we have no vertices left, clear selection (restore all selection
-                    // manipulators and destroy translation manipulator)
-                    if (m_translationManipulator->m_vertices.empty())
-                    {
-                        ClearSelected();
-                    }
-                }
-            }
-
-            // with a selection of more than one or zero, we want to ensure all selection
-            // manipulators are registered (can be clicked on)
-            if (vertexBoxSelectData->m_activeSelection.size() > 1)
-            {
-                for (size_t vertexIndex : vertexBoxSelectData->m_activeSelection)
-                {
-                    if (!m_selectionManipulators[vertexIndex]->Registered())
-                    {
-                        m_selectionManipulators[vertexIndex]->Register(m_manipulatorManagerId);
-                    }
-                }
-            }
-            // special case handling for only one vertex - don't want to display it when
-            // translation manipulator will be in exactly the same location
-            else if (vertexBoxSelectData->m_activeSelection.size() == 1)
+        m_editorBoxSelect.InstallLeftMouseUp(
+            [this, vertexBoxSelectData]()
             {
                 if (vertexBoxSelectData->m_additive)
                 {
-                    m_selectionManipulators[vertexBoxSelectData->m_activeSelection[0]]->Unregister();
+                    // bind FixedVerticesRequestBus for improved performance
+                    typename AZ::FixedVerticesRequestBus<Vertex>::BusPtr fixedVertices;
+                    AZ::FixedVerticesRequestBus<Vertex>::Bind(fixedVertices, GetEntityId());
+
+                    const AZ::EntityComponentIdPair entityComponentIdPair = m_entityComponentIdPair;
+                    for (size_t vertexIndex : vertexBoxSelectData->m_deltaSelection)
+                    {
+                        Vertex vertex;
+                        bool found = false;
+                        AZ::FixedVerticesRequestBus<Vertex>::EventResult(
+                            found, fixedVertices, &AZ::FixedVerticesRequestBus<Vertex>::Handler::GetVertex, vertexIndex, vertex);
+
+                        // if we already have a translation manipulator, add additional vertices to it
+                        if (m_translationManipulator)
+                        {
+                            // otherwise add the new selected vertex
+                            m_translationManipulator->m_vertices.push_back(
+                                typename IndexedTranslationManipulator<Vertex>::VertexLookup{ vertex, Vertex::CreateZero(), vertexIndex });
+                        }
+                        else
+                        {
+                            // create a new translation manipulator if one did not already exist with the first vertex
+                            CreateTranslationManipulator(entityComponentIdPair, m_manipulatorManagerId, vertex, vertexIndex);
+                            // default to ensuring selection manipulators are 'selected'
+                            m_selectionManipulators[vertexIndex]->Select();
+                        }
+                    }
                 }
                 else
                 {
-                    m_selectionManipulators[vertexBoxSelectData->m_activeSelection[0]]->Register(m_manipulatorManagerId);
+                    // removing vertices with an active translation manipulator
+                    if (m_translationManipulator)
+                    {
+                        // iterate through all delta vertices (ones that were either
+                        // added or removed during selection) and remove them
+                        for (size_t vertexIndex : vertexBoxSelectData->m_deltaSelection)
+                        {
+                            auto vertexIt = AZStd::find_if(
+                                m_translationManipulator->m_vertices.begin(), m_translationManipulator->m_vertices.end(),
+                                [vertexIndex](const auto& vertexLookup)
+                                {
+                                    return vertexLookup.m_index == vertexIndex;
+                                });
+
+                            // remove vertex from translation manipulator
+                            if (vertexIt != m_translationManipulator->m_vertices.end())
+                            {
+                                m_translationManipulator->m_vertices.erase(vertexIt);
+
+                                // ensure it is registered to receive input and draw
+                                if (!m_selectionManipulators[vertexIndex]->Registered())
+                                {
+                                    m_selectionManipulators[vertexIndex]->Register(m_manipulatorManagerId);
+                                }
+                            }
+                        }
+
+                        // if we have no vertices left, clear selection (restore all selection
+                        // manipulators and destroy translation manipulator)
+                        if (m_translationManipulator->m_vertices.empty())
+                        {
+                            ClearSelected();
+                        }
+                    }
                 }
-            }
 
-            // update manipulator positions (ensure translation manipulator is
-            // centered on current selection)
-            RefreshTranslationManipulator();
+                // with a selection of more than one or zero, we want to ensure all selection
+                // manipulators are registered (can be clicked on)
+                if (vertexBoxSelectData->m_activeSelection.size() > 1)
+                {
+                    for (size_t vertexIndex : vertexBoxSelectData->m_activeSelection)
+                    {
+                        if (!m_selectionManipulators[vertexIndex]->Registered())
+                        {
+                            m_selectionManipulators[vertexIndex]->Register(m_manipulatorManagerId);
+                        }
+                    }
+                }
+                // special case handling for only one vertex - don't want to display it when
+                // translation manipulator will be in exactly the same location
+                else if (vertexBoxSelectData->m_activeSelection.size() == 1)
+                {
+                    if (vertexBoxSelectData->m_additive)
+                    {
+                        m_selectionManipulators[vertexBoxSelectData->m_activeSelection[0]]->Unregister();
+                    }
+                    else
+                    {
+                        m_selectionManipulators[vertexBoxSelectData->m_activeSelection[0]]->Register(m_manipulatorManagerId);
+                    }
+                }
 
-            // restore state once box select has completed
-            vertexBoxSelectData->m_startSelection.clear();
-            vertexBoxSelectData->m_deltaSelection.clear();
-            vertexBoxSelectData->m_activeSelection.clear();
-            vertexBoxSelectData->m_all.clear();
-        });
+                // update manipulator positions (ensure translation manipulator is
+                // centered on current selection)
+                RefreshTranslationManipulator();
 
-         m_editorBoxSelect.InstallDisplayScene(
-            [this, vertexBoxSelectData]
-            (const AzFramework::ViewportInfo& viewportInfo, AzFramework::DebugDisplayRequests& /*debugDisplay*/)
-         {
-             const auto keyboardModifiers = ViewportInteraction::KeyboardModifiers(
-                 ViewportInteraction::TranslateKeyboardModifiers(QApplication::queryKeyboardModifiers()));
+                // restore state once box select has completed
+                vertexBoxSelectData->m_startSelection.clear();
+                vertexBoxSelectData->m_deltaSelection.clear();
+                vertexBoxSelectData->m_activeSelection.clear();
+                vertexBoxSelectData->m_all.clear();
+            });
 
-             // when modifiers change ensure we refresh box selection for immediate update
-             if (keyboardModifiers != m_editorBoxSelect.PreviousModifiers())
-             {
-                 DoBoxSelect<Vertex>(
-                     GetEntityId(), *vertexBoxSelectData, keyboardModifiers,
-                     viewportInfo.m_viewportId, m_editorBoxSelect, m_selectionManipulators);
-             }
-         });
+        m_editorBoxSelect.InstallDisplayScene(
+            [this, vertexBoxSelectData](const AzFramework::ViewportInfo& viewportInfo, AzFramework::DebugDisplayRequests& /*debugDisplay*/)
+            {
+                const auto keyboardModifiers = ViewportInteraction::KeyboardModifiers(
+                    ViewportInteraction::TranslateKeyboardModifiers(QApplication::queryKeyboardModifiers()));
+
+                // when modifiers change ensure we refresh box selection for immediate update
+                if (keyboardModifiers != m_editorBoxSelect.PreviousModifiers())
+                {
+                    DoBoxSelect<Vertex>(
+                        GetEntityId(), *vertexBoxSelectData, keyboardModifiers, viewportInfo.m_viewportId, m_editorBoxSelect,
+                        m_selectionManipulators);
+                }
+            });
 
         AzFramework::EntityDebugDisplayEventBus::Handler::BusConnect(GetEntityId());
         AzFramework::ViewportDebugDisplayEventBus::Handler::BusConnect(GetEntityContextId());
@@ -734,12 +717,12 @@ namespace AzToolsFramework
         {
             // re-enable all selection manipulators associated with the translation
             // manipulator which is now being removed.
-            m_translationManipulator->Process([this](
-                typename IndexedTranslationManipulator<Vertex>::VertexLookup& vertex)
-            {
-                m_selectionManipulators[vertex.m_index]->Register(m_manipulatorManagerId);
-                m_selectionManipulators[vertex.m_index]->Deselect();
-            });
+            m_translationManipulator->Process(
+                [this](typename IndexedTranslationManipulator<Vertex>::VertexLookup& vertex)
+                {
+                    m_selectionManipulators[vertex.m_index]->Register(m_manipulatorManagerId);
+                    m_selectionManipulators[vertex.m_index]->Deselect();
+                });
 
             m_translationManipulator->m_manipulator.Unregister();
             m_translationManipulator.reset();
@@ -755,8 +738,7 @@ namespace AzToolsFramework
 
     template<typename Vertex>
     void EditorVertexSelectionBase<Vertex>::DisplayEntityViewport(
-        const AzFramework::ViewportInfo& viewportInfo,
-        AzFramework::DebugDisplayRequests& debugDisplay)
+        const AzFramework::ViewportInfo& viewportInfo, AzFramework::DebugDisplayRequests& debugDisplay)
     {
         AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
 
@@ -767,8 +749,7 @@ namespace AzToolsFramework
 
     template<typename Vertex>
     void EditorVertexSelectionBase<Vertex>::DisplayViewport2d(
-        const AzFramework::ViewportInfo& viewportInfo,
-        AzFramework::DebugDisplayRequests& debugDisplay)
+        const AzFramework::ViewportInfo& viewportInfo, AzFramework::DebugDisplayRequests& debugDisplay)
     {
         AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
 
@@ -777,8 +758,7 @@ namespace AzToolsFramework
 
     template<typename Vertex>
     template<typename V, typename AZStd::enable_if<AZStd::is_same<V, AZ::Vector3>::value>::type*>
-    void EditorVertexSelectionBase<Vertex>::UpdateManipulatorSpace(
-        const AzFramework::ViewportInfo& viewportInfo)
+    void EditorVertexSelectionBase<Vertex>::UpdateManipulatorSpace(const AzFramework::ViewportInfo& viewportInfo)
     {
         AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
 
@@ -789,23 +769,19 @@ namespace AzToolsFramework
             &ViewportInteraction::MainEditorViewportInteractionRequestBus::Events::ShowingWorldSpace);
 
         // update the manipulator to be in the correct space if it changed
-        if (    m_translationManipulator
-            && !m_translationManipulator->m_manipulator.PerformingAction()
-            &&  worldSpace != m_worldSpace)
+        if (m_translationManipulator && !m_translationManipulator->m_manipulator.PerformingAction() && worldSpace != m_worldSpace)
         {
             const AZ::Transform worldFromLocal = WorldFromLocalWithUniformScale(GetEntityId());
 
-            m_translationManipulator->m_manipulator.SetLocalOrientation(worldSpace
-                ? QuaternionFromTransformNoScaling(worldFromLocal).GetInverseFull()
-                : AZ::Quaternion::CreateIdentity());
+            m_translationManipulator->m_manipulator.SetLocalOrientation(
+                worldSpace ? QuaternionFromTransformNoScaling(worldFromLocal).GetInverseFull() : AZ::Quaternion::CreateIdentity());
 
             m_worldSpace = worldSpace;
         }
     }
     template<typename Vertex>
     template<typename V, typename AZStd::enable_if<AZStd::is_same<V, AZ::Vector2>::value>::type*>
-    void EditorVertexSelectionBase<Vertex>::UpdateManipulatorSpace(
-        const AzFramework::ViewportInfo& /*viewportInfo*/) const
+    void EditorVertexSelectionBase<Vertex>::UpdateManipulatorSpace(const AzFramework::ViewportInfo& /*viewportInfo*/) const
     {
     }
 
@@ -813,8 +789,7 @@ namespace AzToolsFramework
     static bool CanDeleteSelection(const AZ::EntityId entityId, const int64_t selectedCount)
     {
         size_t vertexCount = 0;
-        AZ::VariableVerticesRequestBus<Vertex>::EventResult(
-            vertexCount, entityId, &AZ::VariableVerticesRequestBus<Vertex>::Handler::Size);
+        AZ::VariableVerticesRequestBus<Vertex>::EventResult(vertexCount, entityId, &AZ::VariableVerticesRequestBus<Vertex>::Handler::Size);
 
         // prevent deleting all vertices
         const int64_t remaining = aznumeric_cast<int64_t>(vertexCount) - selectedCount;
@@ -825,9 +800,8 @@ namespace AzToolsFramework
     void EditorVertexSelectionVariable<Vertex>::ShowVertexDeletionWarning()
     {
         QMessageBox::information(
-            AzToolsFramework::GetActiveWindow(), "Information",
-            "It is not possible to delete all vertices.",
-            QMessageBox::Ok, QMessageBox::NoButton);
+            AzToolsFramework::GetActiveWindow(), "Information", "It is not possible to delete all vertices.", QMessageBox::Ok,
+            QMessageBox::NoButton);
     }
 
     template<typename Vertex>
@@ -856,19 +830,19 @@ namespace AzToolsFramework
                 EditorVertexSelectionBase<Vertex>::m_translationManipulator;
 
             // ensure we remove vertices in reverse order
-            std::sort(translationManipulator->m_vertices.rbegin(), translationManipulator->m_vertices.rend(),
+            std::sort(
+                translationManipulator->m_vertices.rbegin(), translationManipulator->m_vertices.rend(),
                 [](const typename IndexedTranslationManipulator<Vertex>::VertexLookup& lhs,
-                    const typename IndexedTranslationManipulator<Vertex>::VertexLookup& rhs)
-            {
-                return lhs.m_index < rhs.m_index;
-            });
+                   const typename IndexedTranslationManipulator<Vertex>::VertexLookup& rhs)
+                {
+                    return lhs.m_index < rhs.m_index;
+                });
 
-            translationManipulator->Process([this](
-                typename IndexedTranslationManipulator<Vertex>::VertexLookup& vertex)
-            {
-                SafeRemoveVertex<Vertex>(
-                    EditorVertexSelectionBase<Vertex>::GetEntityComponentIdPair(), vertex.m_index);
-            });
+            translationManipulator->Process(
+                [this](typename IndexedTranslationManipulator<Vertex>::VertexLookup& vertex)
+                {
+                    SafeRemoveVertex<Vertex>(EditorVertexSelectionBase<Vertex>::GetEntityComponentIdPair(), vertex.m_index);
+                });
 
             translationManipulator->m_manipulator.Unregister();
             translationManipulator.reset();
@@ -876,8 +850,7 @@ namespace AzToolsFramework
 
         if (EditorVertexSelectionBase<Vertex>::m_hoverSelection)
         {
-            EditorVertexSelectionBase<Vertex>::m_hoverSelection->Register(
-                EditorVertexSelectionBase<Vertex>::GetManipulatorManagerId());
+            EditorVertexSelectionBase<Vertex>::m_hoverSelection->Register(EditorVertexSelectionBase<Vertex>::GetManipulatorManagerId());
         }
 
         EditorVertexSelectionBase<Vertex>::SetState(EditorVertexSelectionBase<Vertex>::State::Selecting);
@@ -895,11 +868,9 @@ namespace AzToolsFramework
             InitializeVertexLookup(*m_translationManipulator, GetEntityId());
             // note: AdaptVertexIn/Out is to ensure we clamp the vertex local Z position to 0 if
             // dealing with Vector2s when setting the position of the manipulator.
-            const AZ::Vector3 localOffset =
-                localPosition - m_translationManipulator->m_manipulator.GetLocalTransform().GetTranslation();
+            const AZ::Vector3 localOffset = localPosition - m_translationManipulator->m_manipulator.GetLocalTransform().GetTranslation();
             UpdateManipulatorsAndVerticesFromOffset(
-                *m_translationManipulator,
-                AZ::AdaptVertexOut<Vertex>(AZ::AdaptVertexIn<Vertex>(localPosition)),
+                *m_translationManipulator, AZ::AdaptVertexOut<Vertex>(AZ::AdaptVertexIn<Vertex>(localPosition)),
                 AZ::AdaptVertexOut<Vertex>(AZ::AdaptVertexIn<Vertex>(localOffset)));
 
             RefreshTranslationManipulator();
@@ -928,23 +899,20 @@ namespace AzToolsFramework
             // calculate average position of selected vertices for translation manipulator
             MidpointCalculator midpointCalculator;
             m_translationManipulator->Process(
-                [this, &midpointCalculator, fixedVertices]
-                (typename IndexedTranslationManipulator<Vertex>::VertexLookup& vertex)
-            {
-                Vertex v;
-                bool found = false;
-                AZ::FixedVerticesRequestBus<Vertex>::EventResult(
-                    found, fixedVertices, &AZ::FixedVerticesRequestBus<Vertex>::Handler::GetVertex,
-                    vertex.m_index, v);
-
-                if (found)
+                [this, &midpointCalculator, fixedVertices](typename IndexedTranslationManipulator<Vertex>::VertexLookup& vertex)
                 {
-                    midpointCalculator.AddPosition(AZ::AdaptVertexOut(v));
-                }
-            });
+                    Vertex v;
+                    bool found = false;
+                    AZ::FixedVerticesRequestBus<Vertex>::EventResult(
+                        found, fixedVertices, &AZ::FixedVerticesRequestBus<Vertex>::Handler::GetVertex, vertex.m_index, v);
 
-            m_translationManipulator->m_manipulator.SetLocalPosition(
-                AZ::AdaptVertexOut(midpointCalculator.CalculateMidpoint()));
+                    if (found)
+                    {
+                        midpointCalculator.AddPosition(AZ::AdaptVertexOut(v));
+                    }
+                });
+
+            m_translationManipulator->m_manipulator.SetLocalPosition(AZ::AdaptVertexOut(midpointCalculator.CalculateMidpoint()));
         }
     }
 
@@ -970,8 +938,7 @@ namespace AzToolsFramework
             Vertex vertex;
             bool found = false;
             AZ::FixedVerticesRequestBus<Vertex>::EventResult(
-                found, fixedVertices, &AZ::FixedVerticesRequestBus<Vertex>::Handler::GetVertex,
-                manipulatorIndex, vertex);
+                found, fixedVertices, &AZ::FixedVerticesRequestBus<Vertex>::Handler::GetVertex, manipulatorIndex, vertex);
 
             if (found)
             {
@@ -1037,39 +1004,41 @@ namespace AzToolsFramework
         }
     }
 
-    /// Handle correctly selecting/deselecting vertices in a vertex selection.
+    // handle correctly selecting/deselecting vertices in a vertex selection.
     template<typename Vertex>
     void EditorVertexSelectionBase<Vertex>::SelectionManipulatorSelectCallback(
-        const size_t vertexIndex, const ViewportInteraction::MouseInteraction& interaction,
-        const AZ::EntityComponentIdPair& entityComponentIdPair, const ManipulatorManagerId managerId)
+        const size_t vertexIndex,
+        const ViewportInteraction::MouseInteraction& interaction,
+        const AZ::EntityComponentIdPair& entityComponentIdPair,
+        const ManipulatorManagerId managerId)
     {
         AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
 
         Vertex vertex;
         bool found = false;
         AZ::FixedVerticesRequestBus<Vertex>::EventResult(
-            found, GetEntityId(), &AZ::FixedVerticesRequestBus<Vertex>::Handler::GetVertex,
-            vertexIndex, vertex);
+            found, GetEntityId(), &AZ::FixedVerticesRequestBus<Vertex>::Handler::GetVertex, vertexIndex, vertex);
 
         if (m_translationManipulator != nullptr && interaction.m_keyboardModifiers.Ctrl())
         {
             // ensure all selection manipulators are enabled when selecting more than one (the first
             // will have been disabled when only selecting an individual vertex
-            m_translationManipulator->Process([this, managerId](
-                typename IndexedTranslationManipulator<Vertex>::VertexLookup& vertexLookup)
-            {
-                m_selectionManipulators[vertexLookup.m_index]->Register(managerId);
-            });
+            m_translationManipulator->Process(
+                [this, managerId](typename IndexedTranslationManipulator<Vertex>::VertexLookup& vertexLookup)
+                {
+                    m_selectionManipulators[vertexLookup.m_index]->Register(managerId);
+                });
 
             // if selection manipulator was selected, find it in the vector of vertices stored in
             // the translation manipulator and remove it
             if (m_selectionManipulators[vertexIndex]->Selected())
             {
-                auto it = AZStd::find_if(m_translationManipulator->m_vertices.begin(), m_translationManipulator->m_vertices.end(),
+                auto it = AZStd::find_if(
+                    m_translationManipulator->m_vertices.begin(), m_translationManipulator->m_vertices.end(),
                     [vertexIndex](const typename IndexedTranslationManipulator<Vertex>::VertexLookup vertexLookup)
-                {
-                    return vertexIndex == vertexLookup.m_index;
-                });
+                    {
+                        return vertexIndex == vertexLookup.m_index;
+                    });
 
                 if (it != m_translationManipulator->m_vertices.end())
                 {
@@ -1099,28 +1068,27 @@ namespace AzToolsFramework
         {
             // if one does not already exist, or we're not holding shift, create a new translation
             // manipulator at this vertex
-            CreateTranslationManipulator(
-                entityComponentIdPair, managerId, vertex, vertexIndex);
+            CreateTranslationManipulator(entityComponentIdPair, managerId, vertex, vertexIndex);
         }
     }
 
-    /// Configure the selection manipulator for fixed editor selection - this configures the view and action
-    /// of interacting with the selection manipulator. Vertices can just be selected (create a translation
-    /// manipulator) but not added or removed.
+    // configure the selection manipulator for fixed editor selection - this configures the view and action
+    // of interacting with the selection manipulator. Vertices can just be selected (create a translation
+    // manipulator) but not added or removed.
     template<typename Vertex>
     void EditorVertexSelectionFixed<Vertex>::SetupSelectionManipulator(
         const AZStd::shared_ptr<SelectionManipulator>& selectionManipulator,
         const AZ::EntityComponentIdPair& entityComponentIdPair,
-        const ManipulatorManagerId managerId, const size_t vertexIndex)
+        const ManipulatorManagerId managerId,
+        const size_t vertexIndex)
     {
         AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
 
         // setup selection manipulator
-        const AZStd::shared_ptr<ManipulatorViewSphere> selectionView =
-            AzToolsFramework::CreateManipulatorViewSphere(AZ::Color(1.0f, 0.0f, 0.0f, 1.0f),
-            g_defaultManipulatorSphereRadius, [&selectionManipulator]
-            (const ViewportInteraction::MouseInteraction& /*mouseInteraction*/,
-                const bool mouseOver, const AZ::Color& defaultColor)
+        const AZStd::shared_ptr<ManipulatorViewSphere> selectionView = AzToolsFramework::CreateManipulatorViewSphere(
+            AZ::Color(1.0f, 0.0f, 0.0f, 1.0f), g_defaultManipulatorSphereRadius,
+            [&selectionManipulator](
+                const ViewportInteraction::MouseInteraction& /*mouseInteraction*/, const bool mouseOver, const AZ::Color& defaultColor)
             {
                 if (selectionManipulator->Selected())
                 {
@@ -1128,72 +1096,68 @@ namespace AzToolsFramework
                 }
 
                 const float opacity[2] = { 0.5f, 1.0f };
-                return AZ::Color(
-                    defaultColor.GetR(), defaultColor.GetG(), defaultColor.GetB(), opacity[mouseOver]);
+                return AZ::Color(defaultColor.GetR(), defaultColor.GetG(), defaultColor.GetB(), opacity[mouseOver]);
             });
 
-        selectionManipulator->SetViews(ManipulatorViews{selectionView});
+        selectionManipulator->SetViews(ManipulatorViews{ selectionView });
 
-        selectionManipulator->InstallLeftMouseUpCallback([
-            this, entityComponentIdPair, vertexIndex, managerId](
-                const ViewportInteraction::MouseInteraction& interaction)
-        {
-            EditorVertexSelectionBase<Vertex>::SelectionManipulatorSelectCallback(
-                vertexIndex, interaction, entityComponentIdPair, managerId);
-        });
+        selectionManipulator->InstallLeftMouseUpCallback(
+            [this, entityComponentIdPair, vertexIndex, managerId](const ViewportInteraction::MouseInteraction& interaction)
+            {
+                EditorVertexSelectionBase<Vertex>::SelectionManipulatorSelectCallback(
+                    vertexIndex, interaction, entityComponentIdPair, managerId);
+            });
     }
 
-    /// Configure the selection manipulator for variable editor selection - this configures the view and action
-    /// of interacting with the selection manipulator. In this case, hovering the mouse with a modifier key held
-    /// will indicate removal, and clicking with a modifier key will remove the vertex.
+    // configure the selection manipulator for variable editor selection - this configures the view and action
+    // of interacting with the selection manipulator. In this case, hovering the mouse with a modifier key held
+    // will indicate removal, and clicking with a modifier key will remove the vertex.
     template<typename Vertex>
     void EditorVertexSelectionVariable<Vertex>::SetupSelectionManipulator(
         const AZStd::shared_ptr<SelectionManipulator>& selectionManipulator,
         const AZ::EntityComponentIdPair& entityComponentIdPair,
-        const ManipulatorManagerId managerId, const size_t vertexIndex)
+        const ManipulatorManagerId managerId,
+        const size_t vertexIndex)
     {
         AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
 
         // setup selection manipulator
-        const AZStd::shared_ptr<ManipulatorViewSphere> manipulatorView =
-            AzToolsFramework::CreateManipulatorViewSphere(AZ::Color(1.0f, 0.0f, 0.0f, 1.0f),
-                g_defaultManipulatorSphereRadius, [&selectionManipulator]
-                (const ViewportInteraction::MouseInteraction& mouseInteraction,
-                    const bool mouseOver, const AZ::Color& defaultColor)
+        const AZStd::shared_ptr<ManipulatorViewSphere> manipulatorView = AzToolsFramework::CreateManipulatorViewSphere(
+            AZ::Color(1.0f, 0.0f, 0.0f, 1.0f), g_defaultManipulatorSphereRadius,
+            [&selectionManipulator](
+                const ViewportInteraction::MouseInteraction& mouseInteraction, const bool mouseOver, const AZ::Color& defaultColor)
+            {
+                if (mouseInteraction.m_keyboardModifiers.Alt() && mouseOver)
                 {
-                    if (mouseInteraction.m_keyboardModifiers.Alt() && mouseOver)
-                    {
-                        // indicate removal of manipulator
-                        return AZ::Color(0.5f, 0.5f, 0.5f, 0.5f);
-                    }
+                    // indicate removal of manipulator
+                    return AZ::Color(0.5f, 0.5f, 0.5f, 0.5f);
+                }
 
-                    // highlight or not if mouse is over
-                    const float opacity[2] = { 0.5f, 1.0f };
-                    if (selectionManipulator->Selected())
-                    {
-                        return AZ::Color(1.0f, 1.0f, 0.0f, opacity[mouseOver]);
-                    }
+                // highlight or not if mouse is over
+                const float opacity[2] = { 0.5f, 1.0f };
+                if (selectionManipulator->Selected())
+                {
+                    return AZ::Color(1.0f, 1.0f, 0.0f, opacity[mouseOver]);
+                }
 
-                    return AZ::Color(
-                        defaultColor.GetR(), defaultColor.GetG(), defaultColor.GetB(), opacity[mouseOver]);
-                });
+                return AZ::Color(defaultColor.GetR(), defaultColor.GetG(), defaultColor.GetB(), opacity[mouseOver]);
+            });
 
-
-        selectionManipulator->SetViews(ManipulatorViews{manipulatorView});
+        selectionManipulator->SetViews(ManipulatorViews{ manipulatorView });
 
         selectionManipulator->InstallLeftMouseUpCallback(
             [this, entityComponentIdPair, vertexIndex, managerId](const ViewportInteraction::MouseInteraction& interaction)
-        {
-            if (interaction.m_keyboardModifiers.Alt())
             {
-                SafeRemoveVertex<Vertex>(entityComponentIdPair, vertexIndex);
-            }
-            else
-            {
-                EditorVertexSelectionBase<Vertex>::SelectionManipulatorSelectCallback(
-                    vertexIndex, interaction, entityComponentIdPair, managerId);
-            }
-        });
+                if (interaction.m_keyboardModifiers.Alt())
+                {
+                    SafeRemoveVertex<Vertex>(entityComponentIdPair, vertexIndex);
+                }
+                else
+                {
+                    EditorVertexSelectionBase<Vertex>::SelectionManipulatorSelectCallback(
+                        vertexIndex, interaction, entityComponentIdPair, managerId);
+                }
+            });
     }
 
     template<typename Vertex>
@@ -1240,15 +1204,17 @@ namespace AzToolsFramework
     template<typename Vertex>
     void EditorVertexSelectionFixed<Vertex>::PrepareActions()
     {
-        ActionOverride backAction = CreateBackAction("Deselect Vertex", "Deselect current vertex selection", [this]()
-        {
-            EditorVertexSelectionBase<Vertex>::ClearSelected();
-        });
+        ActionOverride backAction = CreateBackAction(
+            "Deselect Vertex", "Deselect current vertex selection",
+            [this]()
+            {
+                EditorVertexSelectionBase<Vertex>::ClearSelected();
+            });
 
         backAction.SetEntityComponentIdPair(EditorVertexSelectionBase<Vertex>::GetEntityComponentIdPair());
 
-        EditorVertexSelectionBase<Vertex>::m_actionOverrides[static_cast<size_t>(
-            EditorVertexSelectionBase<Vertex>::State::Translating)] = AZStd::vector<ActionOverride> { backAction };
+        EditorVertexSelectionBase<Vertex>::m_actionOverrides[static_cast<size_t>(EditorVertexSelectionBase<Vertex>::State::Translating)] =
+            AZStd::vector<ActionOverride>{ backAction };
     }
 
     template<typename Vertex>
@@ -1261,12 +1227,13 @@ namespace AzToolsFramework
         MidpointCalculator midpointCalculator;
 
         // sort in descending order
-        std::sort(manipulators.rbegin(), manipulators.rend(),
+        std::sort(
+            manipulators.rbegin(), manipulators.rend(),
             [](const typename IndexedTranslationManipulator<Vertex>::VertexLookup& lhs,
                const typename IndexedTranslationManipulator<Vertex>::VertexLookup& rhs)
-        {
-            return lhs.m_index < rhs.m_index;
-        });
+            {
+                return lhs.m_index < rhs.m_index;
+            });
 
         // iterate over current selection
         for (size_t manipulatorIndex = 0; manipulatorIndex < manipulators.size(); ++manipulatorIndex)
@@ -1313,8 +1280,7 @@ namespace AzToolsFramework
 
         // create translation manipulator for duplicated vertices at new position
         EditorVertexSelectionBase<Vertex>::CreateTranslationManipulator(
-            EditorVertexSelectionBase<Vertex>::GetEntityComponentIdPair(),
-            EditorVertexSelectionBase<Vertex>::GetManipulatorManagerId(),
+            EditorVertexSelectionBase<Vertex>::GetEntityComponentIdPair(), EditorVertexSelectionBase<Vertex>::GetManipulatorManagerId(),
             localCenterPosition, vertices[0].m_index);
 
         // clear all selection manipulators to default unselected state
@@ -1337,47 +1303,46 @@ namespace AzToolsFramework
     template<typename Vertex>
     void EditorVertexSelectionVariable<Vertex>::PrepareActions()
     {
-        ActionOverride deleteAction = CreateDeleteAction(s_deleteVerticesTitle, s_duplicateVerticesDesc, [this]()
-        {
-            DestroySelected();
-        });
+        ActionOverride deleteAction = CreateDeleteAction(
+            s_deleteVerticesTitle, s_duplicateVerticesDesc,
+            [this]()
+            {
+                DestroySelected();
+            });
 
         const AZ::EntityComponentIdPair entityComponentIdPair(
-            EditorVertexSelectionBase<Vertex>::GetEntityId(),
-            EditorVertexSelectionBase<Vertex>::GetComponentId());
+            EditorVertexSelectionBase<Vertex>::GetEntityId(), EditorVertexSelectionBase<Vertex>::GetComponentId());
 
         // note: important to register which entity/component id pair this action is associated with
         deleteAction.SetEntityComponentIdPair(entityComponentIdPair);
 
-        ActionOverride deselectAction = CreateBackAction(s_deselectVerticesTitle, s_deselectVerticesDesc, [this]()
-        {
-            EditorVertexSelectionBase<Vertex>::ClearSelected();
-        });
+        ActionOverride deselectAction = CreateBackAction(
+            s_deselectVerticesTitle, s_deselectVerticesDesc,
+            [this]()
+            {
+                EditorVertexSelectionBase<Vertex>::ClearSelected();
+            });
 
         // note: important to register which entity/component id pair this action is associated with
         deselectAction.SetEntityComponentIdPair(entityComponentIdPair);
 
         EditorVertexSelectionBase<Vertex>::m_actionOverrides[static_cast<size_t>(EditorVertexSelectionBase<Vertex>::State::Translating)] =
-            AZStd::vector<ActionOverride>
-            {
-                ActionOverride()
-                    .SetUri(AzToolsFramework::s_duplicateAction)
-                    .SetKeySequence(QKeySequence(Qt::CTRL + Qt::Key_D))
-                    .SetTitle(s_duplicateVerticesTitle)
-                    .SetTip(s_duplicateVerticesDesc)
-                    .SetCallback([this]()
-                    {
-                        DuplicateSelected();
-                    })
-                    .SetEntityComponentIdPair(entityComponentIdPair),
-                deleteAction,
-                deselectAction
-            };
+            AZStd::vector<ActionOverride>{ ActionOverride()
+                                               .SetUri(AzToolsFramework::s_duplicateAction)
+                                               .SetKeySequence(QKeySequence(Qt::CTRL + Qt::Key_D))
+                                               .SetTitle(s_duplicateVerticesTitle)
+                                               .SetTip(s_duplicateVerticesDesc)
+                                               .SetCallback(
+                                                   [this]()
+                                                   {
+                                                       DuplicateSelected();
+                                                   })
+                                               .SetEntityComponentIdPair(entityComponentIdPair),
+                                           deleteAction, deselectAction };
     }
 
     template<typename Vertex>
-    void InsertVertexAfter(
-        const AZ::EntityComponentIdPair& entityComponentIdPair, const size_t vertexIndex, const Vertex& localPosition)
+    void InsertVertexAfter(const AZ::EntityComponentIdPair& entityComponentIdPair, const size_t vertexIndex, const Vertex& localPosition)
     {
         AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
 
@@ -1389,15 +1354,13 @@ namespace AzToolsFramework
         if (insertPosition >= size)
         {
             AZ::VariableVerticesRequestBus<Vertex>::Event(
-                entityComponentIdPair.GetEntityId(), &AZ::VariableVerticesRequestBus<Vertex>::Handler::AddVertex,
-                localPosition);
+                entityComponentIdPair.GetEntityId(), &AZ::VariableVerticesRequestBus<Vertex>::Handler::AddVertex, localPosition);
         }
         else
         {
             bool updated = false;
             AZ::VariableVerticesRequestBus<Vertex>::EventResult(
-                updated, entityComponentIdPair.GetEntityId(),
-                &AZ::VariableVerticesRequestBus<Vertex>::Handler::InsertVertex,
+                updated, entityComponentIdPair.GetEntityId(), &AZ::VariableVerticesRequestBus<Vertex>::Handler::InsertVertex,
                 insertPosition, localPosition);
         }
 
@@ -1409,21 +1372,16 @@ namespace AzToolsFramework
     {
         bool removed = false;
         AZ::VariableVerticesRequestBus<Vertex>::EventResult(
-            removed, entityComponentIdPair.GetEntityId(),
-            &AZ::VariableVerticesRequestBus<Vertex>::Handler::RemoveVertex, vertexIndex);
+            removed, entityComponentIdPair.GetEntityId(), &AZ::VariableVerticesRequestBus<Vertex>::Handler::RemoveVertex, vertexIndex);
 
         RefreshUiAfterAddRemove(entityComponentIdPair);
     }
 
     // explicit instantiations
-    template void InsertVertexAfter(
-        const AZ::EntityComponentIdPair& entityComponentIdPair, size_t, const AZ::Vector2&);
-    template void InsertVertexAfter(
-        const AZ::EntityComponentIdPair& entityComponentIdPair, size_t, const AZ::Vector3&);
-    template void SafeRemoveVertex<AZ::Vector2>(
-        const AZ::EntityComponentIdPair& entityComponentIdPair, size_t vertexIndex);
-    template void SafeRemoveVertex<AZ::Vector3>(
-        const AZ::EntityComponentIdPair& entityComponentIdPair, size_t vertexIndex);
+    template void InsertVertexAfter(const AZ::EntityComponentIdPair& entityComponentIdPair, size_t, const AZ::Vector2&);
+    template void InsertVertexAfter(const AZ::EntityComponentIdPair& entityComponentIdPair, size_t, const AZ::Vector3&);
+    template void SafeRemoveVertex<AZ::Vector2>(const AZ::EntityComponentIdPair& entityComponentIdPair, size_t vertexIndex);
+    template void SafeRemoveVertex<AZ::Vector3>(const AZ::EntityComponentIdPair& entityComponentIdPair, size_t vertexIndex);
 
     AZ_CLASS_ALLOCATOR_IMPL_TEMPLATE(EditorVertexSelectionFixed<AZ::Vector2>, AZ::SystemAllocator, 0)
     AZ_CLASS_ALLOCATOR_IMPL_TEMPLATE(EditorVertexSelectionFixed<AZ::Vector3>, AZ::SystemAllocator, 0)
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/EditorVertexSelection.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/EditorVertexSelection.h
index 4d1c3ce43f..0036ea42d4 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/EditorVertexSelection.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/EditorVertexSelection.h
@@ -1,22 +1,22 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
 #pragma once
 
 #include <AzCore/Math/VertexContainer.h>
 #include <AzCore/Math/VertexContainerInterface.h>
 #include <AzFramework/Entity/EntityDebugDisplayBus.h>
-#include <AzToolsFramework/Manipulators/ManipulatorBus.h>
 #include <AzToolsFramework/Manipulators/HoverSelection.h>
+#include <AzToolsFramework/Manipulators/ManipulatorBus.h>
 #include <AzToolsFramework/Manipulators/SelectionManipulator.h>
 #include <AzToolsFramework/Manipulators/TranslationManipulators.h>
 #include <AzToolsFramework/Viewport/ActionBus.h>
@@ -24,37 +24,74 @@
 
 namespace AzToolsFramework
 {
-    /// Concrete implementation of AZ::VariableVertices backed by an AZ::VertexContainer.
+    //! Concrete implementation of AZ::VariableVertices backed by an AZ::VertexContainer.
     template<typename Vertex>
-    class VariableVerticesVertexContainer
-        : public AZ::VariableVertices<Vertex>
+    class VariableVerticesVertexContainer : public AZ::VariableVertices<Vertex>
     {
     public:
         explicit VariableVerticesVertexContainer(AZ::VertexContainer<Vertex>& vertexContainer)
-            : m_vertexContainer(vertexContainer) {}
+            : m_vertexContainer(vertexContainer)
+        {
+        }
 
-        bool GetVertex(size_t index, Vertex& vertex) const override { return m_vertexContainer.GetVertex(index, vertex); }
-        bool UpdateVertex(size_t index, const Vertex& vertex) override { return m_vertexContainer.UpdateVertex(index, vertex); };
-        void AddVertex(const Vertex& vertex) override { m_vertexContainer.AddVertex(vertex); }
-        bool InsertVertex(size_t index, const Vertex& vertex) override { return m_vertexContainer.InsertVertex(index, vertex); }
-        bool RemoveVertex(size_t index) override { return m_vertexContainer.RemoveVertex(index); }
-        void SetVertices(const AZStd::vector<Vertex>& vertices) override { m_vertexContainer.SetVertices(vertices); };
-        void ClearVertices() override { m_vertexContainer.Clear(); }
-        size_t Size() const override { return m_vertexContainer.Size();  }
-        bool Empty() const override { return m_vertexContainer.Empty(); }
+        bool GetVertex(size_t index, Vertex& vertex) const override
+        {
+            return m_vertexContainer.GetVertex(index, vertex);
+        }
+
+        bool UpdateVertex(size_t index, const Vertex& vertex) override
+        {
+            return m_vertexContainer.UpdateVertex(index, vertex);
+        };
+
+        void AddVertex(const Vertex& vertex) override
+        {
+            m_vertexContainer.AddVertex(vertex);
+        }
+
+        bool InsertVertex(size_t index, const Vertex& vertex) override
+        {
+            return m_vertexContainer.InsertVertex(index, vertex);
+        }
+
+        bool RemoveVertex(size_t index) override
+        {
+            return m_vertexContainer.RemoveVertex(index);
+        }
+
+        void SetVertices(const AZStd::vector<Vertex>& vertices) override
+        {
+            m_vertexContainer.SetVertices(vertices);
+        };
+
+        void ClearVertices() override
+        {
+            m_vertexContainer.Clear();
+        }
+
+        size_t Size() const override
+        {
+            return m_vertexContainer.Size();
+        }
+
+        bool Empty() const override
+        {
+            return m_vertexContainer.Empty();
+        }
 
     private:
         AZ::VertexContainer<Vertex>& m_vertexContainer;
     };
 
-    /// Concrete implementation of AZ::FixedVertices backed by an AZStd::array.
+    //! Concrete implementation of AZ::FixedVertices backed by an AZStd::array.
     template<typename Vertex, size_t Count>
-    class FixedVerticesArray
-        : public AZ::FixedVertices<Vertex>
+    class FixedVerticesArray : public AZ::FixedVertices<Vertex>
     {
     public:
         explicit FixedVerticesArray(AZStd::array<Vertex, Count>& array)
-            : m_array(array) {}
+            : m_array(array)
+        {
+        }
 
         bool GetVertex(size_t index, Vertex& vertex) const override
         {
@@ -72,22 +109,26 @@ namespace AzToolsFramework
             if (index < m_array.size())
             {
                 m_array[index] = vertex;
-                return true;;
+                return true;
+                ;
             }
 
             return false;
         }
 
-        size_t Size() const override { return m_array.size(); }
+        size_t Size() const override
+        {
+            return m_array.size();
+        }
 
     private:
         AZStd::array<Vertex, Count>& m_array;
     };
 
-    /// EditorVertexSelection provides an interface for a collection of manipulators to expose
-    /// editing of vertices in a container/collection. EditorVertexSelection is templated on the
-    /// type of Vertex (Vector2/Vector3) stored in the container.
-    /// EditorVertexSelectionBase provides common behavior shared across Fixed and Variable selections.
+    //! EditorVertexSelection provides an interface for a collection of manipulators to expose
+    //! editing of vertices in a container/collection. EditorVertexSelection is templated on the
+    //! type of Vertex (Vector2/Vector3) stored in the container.
+    //! EditorVertexSelectionBase provides common behavior shared across Fixed and Variable selections.
     template<typename Vertex>
     class EditorVertexSelectionBase
         : private AzFramework::EntityDebugDisplayEventBus::Handler
@@ -99,89 +140,110 @@ namespace AzToolsFramework
         EditorVertexSelectionBase& operator=(EditorVertexSelectionBase&&) = default;
         virtual ~EditorVertexSelectionBase() = default;
 
-        /// Setup and configure the EditorVertexSelection for operation.
+        //! Setup and configure the EditorVertexSelection for operation.
         void Create(
-            const AZ::EntityComponentIdPair& entityComponentIdPair, ManipulatorManagerId managerId,
+            const AZ::EntityComponentIdPair& entityComponentIdPair,
+            ManipulatorManagerId managerId,
             AZStd::unique_ptr<HoverSelection> hoverSelection,
             TranslationManipulators::Dimensions dimensions,
             TranslationManipulatorConfiguratorFn translationManipulatorConfigurator);
 
-        /// Create a translation manipulator for a given vertex.
+        //! Create a translation manipulator for a given vertex.
         void CreateTranslationManipulator(
-            const AZ::EntityComponentIdPair& entityComponentIdPair,
-            ManipulatorManagerId managerId, const Vertex& vertex, size_t index);
+            const AZ::EntityComponentIdPair& entityComponentIdPair, ManipulatorManagerId managerId, const Vertex& vertex, size_t index);
 
-        /// Destroy all manipulators associated with the vertex selection.
+        //! Destroy all manipulators associated with the vertex selection.
         void Destroy();
 
-        /// Set custom callback for when vertex positions are updated.
+        //! Set custom callback for when vertex positions are updated.
         void SetVertexPositionsUpdatedCallback(const AZStd::function<void()>& callback);
 
-        /// Update manipulators based on local changes to vertex positions.
+        //! Update manipulators based on local changes to vertex positions.
         void RefreshLocal();
-        /// Update the translation manipulator to be correctly positioned based
-        /// on the current selection (recenter it).
+        //! Update the translation manipulator to be correctly positioned based
+        //! on the current selection (recenter it).
         void RefreshTranslationManipulator();
-        /// Update manipulators based on changes to the entity's transform and non-uniform scale.
+        //! Update manipulators based on changes to the entity's transform and non-uniform scale.
         void RefreshSpace(const AZ::Transform& worldFromLocal, const AZ::Vector3& nonUniformScale = AZ::Vector3::CreateOne());
 
-        /// Set bounds dirty (need recalculating) for all owned manipulators (selection, translation, hover).
+        //! Set bounds dirty (need recalculating) for all owned manipulators (selection, translation, hover).
         void SetBoundsDirty();
 
-        /// How should the EditorVertexSelection respond to mouse input.
-        virtual bool HandleMouse(
-            const ViewportInteraction::MouseInteractionEvent& mouseInteraction);
+        //! How should the EditorVertexSelection respond to mouse input.
+        virtual bool HandleMouse(const ViewportInteraction::MouseInteractionEvent& mouseInteraction);
 
-        /// Snap the selected vertices to the terrain.
-        /// Note: With a multi-selection the manipulator will be translated to the picked
-        /// terrain position with all verts moved relative to it.
-        void SnapVerticesToTerrain(
-            const ViewportInteraction::MouseInteractionEvent& mouseInteraction);
+        //! Snap the selected vertices to the terrain.
+        //! Note: With a multi-selection the manipulator will be translated to the picked
+        //! terrain position with all vertices moved relative to it.
+        void SnapVerticesToTerrain(const ViewportInteraction::MouseInteractionEvent& mouseInteraction);
 
-        /// The Actions provided by the EditorVertexSelection while it is active.
-        /// e.g. Vertex deletion, duplication etc.
+        //! The Actions provided by the EditorVertexSelection while it is active.
+        //! e.g. Vertex deletion, duplication etc.
         AZStd::vector<ActionOverride> ActionOverrides() const;
 
-        /// Let the EditorVertexSelection know a batch movement is about to begin so it
-        /// can avoid certain unnecessary updates.
+        //! Let the EditorVertexSelection know a batch movement is about to begin so it
+        //! can avoid certain unnecessary updates.
         void BeginBatchMovement();
 
-        /// Let the EditorVertexSelection know a batch movement has ended so it can return
-        /// to its normal state.
+        //! Let the EditorVertexSelection know a batch movement has ended so it can return
+        //! to its normal state.
         void EndBatchMovement();
 
-        /// Set the position of the TranslationManipulators (if active).
+        //! Set the position of the TranslationManipulators (if active).
         void SetSelectedPosition(const AZ::Vector3& localPosition);
 
-        AZ::EntityId GetEntityId() const { return m_entityComponentIdPair.GetEntityId(); }
+        AZ::EntityId GetEntityId() const
+        {
+            return m_entityComponentIdPair.GetEntityId();
+        }
 
     protected:
-        /// Internal interface for EditorVertexSelection.
+        //! Internal interface for EditorVertexSelection.
         virtual void SetupSelectionManipulator(
             const AZStd::shared_ptr<SelectionManipulator>& selectionManipulator,
             const AZ::EntityComponentIdPair& entityComponentIdPair,
-            ManipulatorManagerId managerId, size_t index) = 0;
+            ManipulatorManagerId managerId,
+            size_t index) = 0;
         virtual void PrepareActions() = 0;
 
-        /// Default behavior when clicking on a selection manipulator (representing a vertex).
+        //! Default behavior when clicking on a selection manipulator (representing a vertex).
         void SelectionManipulatorSelectCallback(
-            size_t index, const ViewportInteraction::MouseInteraction& interaction,
-            const AZ::EntityComponentIdPair& entityComponentIdPair, ManipulatorManagerId managerId);
+            size_t index,
+            const ViewportInteraction::MouseInteraction& interaction,
+            const AZ::EntityComponentIdPair& entityComponentIdPair,
+            ManipulatorManagerId managerId);
 
-        /// Destroy the translation manipulator and deselect all vertices.
+        //! Destroy the translation manipulator and deselect all vertices.
         void ClearSelected();
 
-        AZ::ComponentId GetComponentId() const { return m_entityComponentIdPair.GetComponentId(); }
-        const AZ::EntityComponentIdPair& GetEntityComponentIdPair() const { return m_entityComponentIdPair; }
-        ManipulatorManagerId GetManipulatorManagerId() const { return m_manipulatorManagerId; }
+        AZ::ComponentId GetComponentId() const
+        {
+            return m_entityComponentIdPair.GetComponentId();
+        }
 
-        /// Is the translation vertex manipulator in 2D or 3D.
-        TranslationManipulators::Dimensions Dimensions() const { return m_dimensions; }
+        const AZ::EntityComponentIdPair& GetEntityComponentIdPair() const
+        {
+            return m_entityComponentIdPair;
+        }
 
-        /// How to configure the translation manipulator (view and axes).
-        TranslationManipulatorConfiguratorFn ConfiguratorFn() const { return  m_manipulatorConfiguratorFn; }
+        ManipulatorManagerId GetManipulatorManagerId() const
+        {
+            return m_manipulatorManagerId;
+        }
 
-        /// The state we are in when editing vertices.
+        //! Is the translation vertex manipulator in 2D or 3D.
+        TranslationManipulators::Dimensions Dimensions() const
+        {
+            return m_dimensions;
+        }
+
+        //! How to configure the translation manipulator (view and axes).
+        TranslationManipulatorConfiguratorFn ConfiguratorFn() const
+        {
+            return m_manipulatorConfiguratorFn;
+        }
+
+        //! The state we are in when editing vertices.
         enum class State
         {
             Selecting,
@@ -190,23 +252,22 @@ namespace AzToolsFramework
 
         void SetState(State state);
 
-        AZStd::unique_ptr<HoverSelection> m_hoverSelection = nullptr; ///< Interface to hover selection, representing bounds that can be selected.
-        AZStd::shared_ptr<IndexedTranslationManipulator<Vertex>> m_translationManipulator = nullptr; ///< Manipulator when vertex is selected to translate it.
-        AZStd::vector<AZStd::shared_ptr<SelectionManipulator>> m_selectionManipulators; ///< Manipulators for each vertex when entity is selected.
-        AZStd::array<AZStd::vector<ActionOverride>, 2> m_actionOverrides; ///< Available actions corresponding to each mode.
+        AZStd::unique_ptr<HoverSelection> m_hoverSelection =
+            nullptr; //!< Interface to hover selection, representing bounds that can be selected.
+        AZStd::shared_ptr<IndexedTranslationManipulator<Vertex>> m_translationManipulator =
+            nullptr; //!< Manipulator when vertex is selected to translate it.
+        AZStd::vector<AZStd::shared_ptr<SelectionManipulator>>
+            m_selectionManipulators; //!< Manipulators for each vertex when entity is selected.
+        AZStd::array<AZStd::vector<ActionOverride>, 2> m_actionOverrides; //!< Available actions corresponding to each mode.
 
     private:
         // AzFramework::EntityDebugDisplayEventBus
-        void DisplayEntityViewport(
-            const AzFramework::ViewportInfo& viewportInfo,
-            AzFramework::DebugDisplayRequests& debugDisplay) override;
+        void DisplayEntityViewport(const AzFramework::ViewportInfo& viewportInfo, AzFramework::DebugDisplayRequests& debugDisplay) override;
 
         // AzFramework::ViewportDebugDisplayEventBus
-        void DisplayViewport2d(
-            const AzFramework::ViewportInfo& viewportInfo,
-            AzFramework::DebugDisplayRequests& debugDisplay) override;
+        void DisplayViewport2d(const AzFramework::ViewportInfo& viewportInfo, AzFramework::DebugDisplayRequests& debugDisplay) override;
 
-        /// Set selected manipulator and vertices position from offset from starting position when pressed.
+        //! Set selected manipulator and vertices position from offset from starting position when pressed.
         void UpdateManipulatorsAndVerticesFromOffset(
             IndexedTranslationManipulator<Vertex>& translationManipulator,
             const AZ::Vector3& localManipulatorStartPosition,
@@ -217,23 +278,24 @@ namespace AzToolsFramework
         template<typename V, typename AZStd::enable_if<AZStd::is_same<V, AZ::Vector2>::value>::type* = nullptr>
         void UpdateManipulatorSpace(const AzFramework::ViewportInfo& viewportInfo) const;
 
-        EditorBoxSelect m_editorBoxSelect; ///< Provide box select support for vertex selection.
-        AZ::EntityComponentIdPair m_entityComponentIdPair; ///< Id of the Entity and Component this editor vertex selection was created on.
-        ManipulatorManagerId m_manipulatorManagerId; ///< Id of the manager manipulators created from this type will be associated with.
-        TranslationManipulators::Dimensions m_dimensions = TranslationManipulators::Dimensions::Three; ///< The dimensions this vertex selection was created with.
-        TranslationManipulatorConfiguratorFn m_manipulatorConfiguratorFn = nullptr; ///< Function pointer set on Create to decide look and functionality of translation manipulator.
-        AZStd::function<void()> m_onVertexPositionsUpdated = nullptr; ///< Callback for when vertex positions are changed.
-        State m_state = State::Selecting; ///< Different states VertexSelection can be in.
-        bool m_worldSpace = false; ///< Are the manipulators being used in local or world space.
-        bool m_batchMovementInProgress = false; ///< If a batch movement operation is in progress we do not want to
-                                                ///< refresh the VertexSelection during it for performance reasons.
+        EditorBoxSelect m_editorBoxSelect; //!< Provide box select support for vertex selection.
+        AZ::EntityComponentIdPair m_entityComponentIdPair; //!< Id of the Entity and Component this editor vertex selection was created on.
+        ManipulatorManagerId m_manipulatorManagerId; //!< Id of the manager manipulators created from this type will be associated with.
+        TranslationManipulators::Dimensions m_dimensions =
+            TranslationManipulators::Dimensions::Three; //!< The dimensions this vertex selection was created with.
+        TranslationManipulatorConfiguratorFn m_manipulatorConfiguratorFn =
+            nullptr; //!< Function pointer set on Create to decide look and functionality of translation manipulator.
+        AZStd::function<void()> m_onVertexPositionsUpdated = nullptr; //!< Callback for when vertex positions are changed.
+        State m_state = State::Selecting; //!< Different states VertexSelection can be in.
+        bool m_worldSpace = false; //!< Are the manipulators being used in local or world space.
+        bool m_batchMovementInProgress = false; //!< If a batch movement operation is in progress we do not want to
+                                                //!< refresh the VertexSelection during it for performance reasons.
     };
 
-    /// EditorVertexSelectionFixed provides selection and editing for a fixed length number of
-    /// vertices. New vertices cannot be inserted/added or removed.
+    //! EditorVertexSelectionFixed provides selection and editing for a fixed length number of
+    //! vertices. New vertices cannot be inserted/added or removed.
     template<typename Vertex>
-    class EditorVertexSelectionFixed
-        : public EditorVertexSelectionBase<Vertex>
+    class EditorVertexSelectionFixed : public EditorVertexSelectionBase<Vertex>
     {
     public:
         AZ_CLASS_ALLOCATOR_DECL
@@ -247,15 +309,15 @@ namespace AzToolsFramework
         void SetupSelectionManipulator(
             const AZStd::shared_ptr<SelectionManipulator>& selectionManipulator,
             const AZ::EntityComponentIdPair& entityComponentIdPair,
-            ManipulatorManagerId managerId, size_t index) override;
+            ManipulatorManagerId managerId,
+            size_t index) override;
         void PrepareActions() override;
     };
 
-    /// EditorVertexSelectionVariable provides selection and editing for a variable length number of
-    /// vertices. New vertices can be inserted/added or removed from the collection.
+    //! EditorVertexSelectionVariable provides selection and editing for a variable length number of
+    //! vertices. New vertices can be inserted/added or removed from the collection.
     template<typename Vertex>
-    class EditorVertexSelectionVariable
-        : public EditorVertexSelectionBase<Vertex>
+    class EditorVertexSelectionVariable : public EditorVertexSelectionBase<Vertex>
     {
     public:
         AZ_CLASS_ALLOCATOR_DECL
@@ -272,7 +334,8 @@ namespace AzToolsFramework
         void SetupSelectionManipulator(
             const AZStd::shared_ptr<SelectionManipulator>& selectionManipulator,
             const AZ::EntityComponentIdPair& entityComponentIdPair,
-            ManipulatorManagerId managerId, size_t vertIndex) override;
+            ManipulatorManagerId managerId,
+            size_t vertIndex) override;
 
         //! Presents a warning to the user that vertices will not be deleted.
         //! @note Allow overriding by derived classes to make this a noop if required.
@@ -281,21 +344,18 @@ namespace AzToolsFramework
     private:
         void PrepareActions() override;
 
-        /// @return The center point of the selected vertices.
-        Vertex InsertSelectedInPlace(
-            AZStd::vector<typename IndexedTranslationManipulator<Vertex>::VertexLookup>& manipulators);
+        //! @return The center point of the selected vertices.
+        Vertex InsertSelectedInPlace(AZStd::vector<typename IndexedTranslationManipulator<Vertex>::VertexLookup>& manipulators);
     };
 
-    /// Helper for inserting a vertex in a variable vertices container.
+    //! Helper for inserting a vertex in a variable vertices container.
     template<typename Vertex>
-    void InsertVertexAfter(
-        const AZ::EntityComponentIdPair& entityComponentIdPair, size_t vertIndex, const Vertex& localPosition);
+    void InsertVertexAfter(const AZ::EntityComponentIdPair& entityComponentIdPair, size_t vertIndex, const Vertex& localPosition);
 
-    /// Helper for removing a vertex in a variable vertices container.
-    /// Remove a vertex from the container and ensure the associated manipulator is unset and
-    /// property display values are refreshed.
+    //! Helper for removing a vertex in a variable vertices container.
+    //! Remove a vertex from the container and ensure the associated manipulator is unset and
+    //! property display values are refreshed.
     template<typename Vertex>
-    void SafeRemoveVertex(
-        const AZ::EntityComponentIdPair& entityComponentIdPair, size_t vertexIndex);
+    void SafeRemoveVertex(const AZ::EntityComponentIdPair& entityComponentIdPair, size_t vertexIndex);
 
 } // namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/HoverSelection.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/HoverSelection.h
index c5f58f0d56..a389237b2b 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/HoverSelection.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/HoverSelection.h
@@ -1,14 +1,14 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
 #pragma once
 
@@ -16,10 +16,10 @@
 
 namespace AzToolsFramework
 {
-    /// HoverSelection provides an interface for manipulator/s offering selection when
-    /// the mouse is hovered over a particular bound. This interface is used to represent
-    /// a Spline manipulator bound, and a series of LineSegment manipulator bounds.
-    /// This generic interface allows EditorVertexSelection to use either Spline or LineSegment selection.
+    //! HoverSelection provides an interface for manipulator/s offering selection when
+    //! the mouse is hovered over a particular bound. This interface is used to represent
+    //! a Spline manipulator bound, and a series of LineSegment manipulator bounds.
+    //! This generic interface allows EditorVertexSelection to use either Spline or LineSegment selection.
     class HoverSelection
     {
     public:
@@ -33,21 +33,37 @@ namespace AzToolsFramework
         virtual void SetNonUniformScale(const AZ::Vector3& nonUniformScale) = 0;
     };
 
-    /// NullHoverSelection is used when vertices cannot be inserted. This serves as a no-op
-    /// and is used to prevent the need for additional null checks in EditorVertexSelection.
-    class NullHoverSelection
-        : public HoverSelection
+    //! NullHoverSelection is used when vertices cannot be inserted. This serves as a no-op
+    //! and is used to prevent the need for additional null checks in EditorVertexSelection.
+    class NullHoverSelection : public HoverSelection
     {
     public:
         NullHoverSelection() = default;
         NullHoverSelection(const NullHoverSelection&) = delete;
         NullHoverSelection& operator=(const NullHoverSelection&) = delete;
 
-        void Register(ManipulatorManagerId /*managerId*/) override {}
-        void Unregister() override {}
-        void SetBoundsDirty() override {}
-        void Refresh() override {}
-        void SetSpace(const AZ::Transform& /*worldFromLocal*/) override {}
-        void SetNonUniformScale([[maybe_unused]] const AZ::Vector3& nonUniformScale) override {}
+        void Register([[maybe_unused]] ManipulatorManagerId managerId) override
+        {
+        }
+
+        void Unregister() override
+        {
+        }
+
+        void SetBoundsDirty() override
+        {
+        }
+
+        void Refresh() override
+        {
+        }
+
+        void SetSpace([[maybe_unused]] const AZ::Transform& worldFromLocal) override
+        {
+        }
+
+        void SetNonUniformScale([[maybe_unused]] const AZ::Vector3& nonUniformScale) override
+        {
+        }
     };
 } // namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/LineHoverSelection.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/LineHoverSelection.cpp
index e26c154be9..12d5f399c3 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/LineHoverSelection.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/LineHoverSelection.cpp
@@ -1,14 +1,14 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
 #include "LineHoverSelection.h"
 
@@ -22,17 +22,15 @@
 
 namespace AzToolsFramework
 {
-    static const AZ::Color s_lineSelectManipulatorColor = AZ::Color(0.0f, 1.0f, 0.0f, 1.0f);
+    static const AZ::Color LineSelectManipulatorColor = AZ::Color(0.0f, 1.0f, 0.0f, 1.0f);
 
     template<typename Vertex>
-    static void UpdateLineSegmentPosition(
-        const size_t vertIndex, const AZ::EntityId entityId, LineSegmentSelectionManipulator& lineSegment)
+    static void UpdateLineSegmentPosition(const size_t vertIndex, const AZ::EntityId entityId, LineSegmentSelectionManipulator& lineSegment)
     {
         Vertex start;
         bool foundStart = false;
         AZ::FixedVerticesRequestBus<Vertex>::EventResult(
-            foundStart, entityId, &AZ::FixedVerticesRequestBus<Vertex>::Handler::GetVertex,
-            vertIndex, start);
+            foundStart, entityId, &AZ::FixedVerticesRequestBus<Vertex>::Handler::GetVertex, vertIndex, start);
 
         if (foundStart)
         {
@@ -40,14 +38,12 @@ namespace AzToolsFramework
         }
 
         size_t size = 0;
-        AZ::FixedVerticesRequestBus<Vertex>::EventResult(
-            size, entityId, &AZ::FixedVerticesRequestBus<Vertex>::Handler::Size);
+        AZ::FixedVerticesRequestBus<Vertex>::EventResult(size, entityId, &AZ::FixedVerticesRequestBus<Vertex>::Handler::Size);
 
         Vertex end;
         bool foundEnd = false;
         AZ::FixedVerticesRequestBus<Vertex>::EventResult(
-            foundEnd, entityId, &AZ::FixedVerticesRequestBus<Vertex>::Handler::GetVertex,
-            (vertIndex + 1) % size, end);
+            foundEnd, entityId, &AZ::FixedVerticesRequestBus<Vertex>::Handler::GetVertex, (vertIndex + 1) % size, end);
 
         if (foundEnd)
         {
@@ -56,8 +52,7 @@ namespace AzToolsFramework
 
         // update the view
         const float lineWidth = 0.05f;
-        lineSegment.SetView(
-            CreateManipulatorViewLineSelect(lineSegment, s_lineSelectManipulatorColor, lineWidth));
+        lineSegment.SetView(CreateManipulatorViewLineSelect(lineSegment, LineSelectManipulatorColor, lineWidth));
     }
 
     template<typename Vertex>
@@ -66,9 +61,8 @@ namespace AzToolsFramework
         : m_entityId(entityComponentIdPair.GetEntityId())
     {
         // create a line segment manipulator from vertex positions and setup its callback
-        auto setupLineSegment = [this] (
-            const AZ::EntityComponentIdPair& entityComponentIdPair,
-            const ManipulatorManagerId managerId, const size_t vertIndex)
+        auto setupLineSegment =
+            [this](const AZ::EntityComponentIdPair& entityComponentIdPair, const ManipulatorManagerId managerId, const size_t vertIndex)
         {
             m_lineSegmentManipulators.push_back(LineSegmentSelectionManipulator::MakeShared());
             AZStd::shared_ptr<LineSegmentSelectionManipulator>& lineSegmentManipulator = m_lineSegmentManipulators.back();
@@ -81,11 +75,9 @@ namespace AzToolsFramework
 
             lineSegmentManipulator->InstallLeftMouseUpCallback(
                 [vertIndex, entityComponentIdPair](const LineSegmentSelectionManipulator::Action& action)
-            {
-                InsertVertexAfter<Vertex>(
-                    entityComponentIdPair, vertIndex,
-                    AZ::AdaptVertexIn<Vertex>(action.m_localLineHitPosition));
-            });
+                {
+                    InsertVertexAfter<Vertex>(entityComponentIdPair, vertIndex, AZ::AdaptVertexIn<Vertex>(action.m_localLineHitPosition));
+                });
         };
 
         // create all line segment manipulators for the polygon prism (used for selection bounds)
@@ -150,8 +142,7 @@ namespace AzToolsFramework
     void LineSegmentHoverSelection<Vertex>::Refresh()
     {
         size_t vertexCount = 0;
-        AZ::FixedVerticesRequestBus<Vertex>::EventResult(
-            vertexCount, m_entityId, &AZ::FixedVerticesRequestBus<Vertex>::Handler::Size);
+        AZ::FixedVerticesRequestBus<Vertex>::EventResult(vertexCount, m_entityId, &AZ::FixedVerticesRequestBus<Vertex>::Handler::Size);
 
         // update the start/end positions of all the line segment manipulators to ensure
         // they stay consistent with the polygon prism shape
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/LineHoverSelection.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/LineHoverSelection.h
index eb5e3991c5..e14930f9ca 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/LineHoverSelection.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/LineHoverSelection.h
@@ -1,14 +1,14 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
 #pragma once
 
@@ -25,17 +25,14 @@ namespace AzToolsFramework
 {
     class LineSegmentSelectionManipulator;
 
-    /// LineSegmentHoverSelection is a concrete implementation of HoverSelection wrapping a collection/container
-    /// of vertices and a list of LineSegmentManipulators. The underlying manipulators are used to control selection
-    /// by highlighting where on the line a new vertex will be inserted.
+    //! LineSegmentHoverSelection is a concrete implementation of HoverSelection wrapping a collection/container
+    //! of vertices and a list of LineSegmentManipulators. The underlying manipulators are used to control selection
+    //! by highlighting where on the line a new vertex will be inserted.
     template<typename Vertex>
-    class LineSegmentHoverSelection
-        : public HoverSelection
+    class LineSegmentHoverSelection : public HoverSelection
     {
     public:
-        explicit LineSegmentHoverSelection(
-            const AZ::EntityComponentIdPair& entityComponentIdPair,
-            ManipulatorManagerId managerId);
+        explicit LineSegmentHoverSelection(const AZ::EntityComponentIdPair& entityComponentIdPair, ManipulatorManagerId managerId);
         LineSegmentHoverSelection(const LineSegmentHoverSelection&) = delete;
         LineSegmentHoverSelection& operator=(const LineSegmentHoverSelection&) = delete;
         ~LineSegmentHoverSelection();
@@ -49,6 +46,6 @@ namespace AzToolsFramework
 
     private:
         AZ::EntityId m_entityId;
-        AZStd::vector<AZStd::shared_ptr<LineSegmentSelectionManipulator>> m_lineSegmentManipulators; ///< Manipulators for each line.
+        AZStd::vector<AZStd::shared_ptr<LineSegmentSelectionManipulator>> m_lineSegmentManipulators; //!< Manipulators for each line.
     };
 } // namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/LineSegmentSelectionManipulator.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/LineSegmentSelectionManipulator.cpp
index 8874e0dcd9..45f2803818 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/LineSegmentSelectionManipulator.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/LineSegmentSelectionManipulator.cpp
@@ -1,14 +1,14 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
 #include "LineSegmentSelectionManipulator.h"
 
@@ -20,15 +20,20 @@
 namespace AzToolsFramework
 {
     LineSegmentSelectionManipulator::Action CalculateManipulationDataAction(
-        const AZ::Transform& worldFromLocal, const AZ::Vector3& nonUniformScale, const AZ::Vector3& rayOrigin,
-        const AZ::Vector3& rayDirection, const float rayLength, const AZ::Vector3& localStart, const AZ::Vector3& localEnd)
+        const AZ::Transform& worldFromLocal,
+        const AZ::Vector3& nonUniformScale,
+        const AZ::Vector3& rayOrigin,
+        const AZ::Vector3& rayDirection,
+        const float rayLength,
+        const AZ::Vector3& localStart,
+        const AZ::Vector3& localEnd)
     {
         AZ::Vector3 worldClosestPositionRay, worldClosestPositionLineSegment;
         float rayProportion, lineSegmentProportion;
         AZ::Intersect::ClosestSegmentSegment(
-            rayOrigin, rayOrigin + rayDirection * rayLength,
-            worldFromLocal.TransformPoint(nonUniformScale * localStart), worldFromLocal.TransformPoint(nonUniformScale * localEnd),
-            rayProportion, lineSegmentProportion, worldClosestPositionRay, worldClosestPositionLineSegment);
+            rayOrigin, rayOrigin + rayDirection * rayLength, worldFromLocal.TransformPoint(nonUniformScale * localStart),
+            worldFromLocal.TransformPoint(nonUniformScale * localEnd), rayProportion, lineSegmentProportion, worldClosestPositionRay,
+            worldClosestPositionLineSegment);
 
         AZ::Transform worldFromLocalNormalized = worldFromLocal;
         const AZ::Vector3 scale = worldFromLocalNormalized.ExtractUniformScale() * nonUniformScale;
@@ -47,7 +52,9 @@ namespace AzToolsFramework
         AttachLeftMouseDownImpl();
     }
 
-    LineSegmentSelectionManipulator::~LineSegmentSelectionManipulator() {}
+    LineSegmentSelectionManipulator::~LineSegmentSelectionManipulator()
+    {
+    }
 
     void LineSegmentSelectionManipulator::InstallLeftMouseDownCallback(const MouseActionCallback& onMouseDownCallback)
     {
@@ -112,12 +119,9 @@ namespace AzToolsFramework
         if (mouseInteraction.m_keyboardModifiers.Ctrl() && !mouseInteraction.m_keyboardModifiers.Shift())
         {
             m_manipulatorView->Draw(
-                GetManipulatorManagerId(), managerState,
-                GetManipulatorId(), {
-                    TransformUniformScale(GetSpace()), GetNonUniformScale(),
-                    m_localStart, MouseOver()
-                },
-                debugDisplay, cameraState, mouseInteraction);
+                GetManipulatorManagerId(), managerState, GetManipulatorId(),
+                { TransformUniformScale(GetSpace()), GetNonUniformScale(), m_localStart, MouseOver() }, debugDisplay, cameraState,
+                mouseInteraction);
         }
     }
 
@@ -135,4 +139,4 @@ namespace AzToolsFramework
     {
         m_manipulatorView->Invalidate(GetManipulatorManagerId());
     }
-}
+} // namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/LineSegmentSelectionManipulator.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/LineSegmentSelectionManipulator.h
index d9e317c378..107a0ccf9f 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/LineSegmentSelectionManipulator.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/LineSegmentSelectionManipulator.h
@@ -1,14 +1,14 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
 #pragma once
 
@@ -20,12 +20,12 @@ namespace AzToolsFramework
 {
     class ManipulatorView;
 
-    /// A manipulator to expose where on a line a user is moving their mouse.
+    //! A manipulator to expose where on a line a user is moving their mouse.
     class LineSegmentSelectionManipulator
         : public BaseManipulator
         , public ManipulatorSpace
     {
-        /// Private constructor.
+        //! Private constructor.
         LineSegmentSelectionManipulator();
 
     public:
@@ -37,10 +37,10 @@ namespace AzToolsFramework
 
         ~LineSegmentSelectionManipulator();
 
-        /// A Manipulator must only be created and managed through a shared_ptr.
+        //! A Manipulator must only be created and managed through a shared_ptr.
         static AZStd::shared_ptr<LineSegmentSelectionManipulator> MakeShared();
 
-        /// Mouse action data used by MouseActionCallback.
+        //! Mouse action data used by MouseActionCallback.
         struct Action
         {
             AZ::Vector3 m_localLineHitPosition;
@@ -57,18 +57,31 @@ namespace AzToolsFramework
             const AzFramework::CameraState& cameraState,
             const ViewportInteraction::MouseInteraction& mouseInteraction) override;
 
-        void SetStart(const AZ::Vector3& startLocal) { m_localStart = startLocal; }
-        void SetEnd(const AZ::Vector3& endLocal) { m_localEnd = endLocal; }
-        const AZ::Vector3& GetStart() const { return m_localStart; }
-        const AZ::Vector3& GetEnd() const { return m_localEnd; }
+        void SetStart(const AZ::Vector3& startLocal)
+        {
+            m_localStart = startLocal;
+        }
+
+        void SetEnd(const AZ::Vector3& endLocal)
+        {
+            m_localEnd = endLocal;
+        }
+
+        const AZ::Vector3& GetStart() const
+        {
+            return m_localStart;
+        }
+
+        const AZ::Vector3& GetEnd() const
+        {
+            return m_localEnd;
+        }
 
         void SetView(AZStd::unique_ptr<ManipulatorView>&& view);
 
     private:
-        void OnLeftMouseDownImpl(
-            const ViewportInteraction::MouseInteraction& interaction, float rayIntersectionDistance) override;
-        void OnLeftMouseUpImpl(
-            const ViewportInteraction::MouseInteraction& interaction) override;
+        void OnLeftMouseDownImpl(const ViewportInteraction::MouseInteraction& interaction, float rayIntersectionDistance) override;
+        void OnLeftMouseUpImpl(const ViewportInteraction::MouseInteraction& interaction) override;
 
         void InvalidateImpl() override;
         void SetBoundsDirtyImpl() override;
@@ -79,12 +92,18 @@ namespace AzToolsFramework
         MouseActionCallback m_onLeftMouseDownCallback = nullptr;
         MouseActionCallback m_onLeftMouseUpCallback = nullptr;
 
-        ViewportInteraction::KeyboardModifiers m_keyboardModifiers; ///< What modifier keys are pressed when interacting with this manipulator.
+        ViewportInteraction::KeyboardModifiers
+            m_keyboardModifiers; //!< What modifier keys are pressed when interacting with this manipulator.
 
-        AZStd::unique_ptr<ManipulatorView> m_manipulatorView = nullptr; ///< Look of manipulator.
+        AZStd::unique_ptr<ManipulatorView> m_manipulatorView = nullptr; //!< Look of manipulator.
     };
 
     LineSegmentSelectionManipulator::Action CalculateManipulationDataAction(
-        const AZ::Transform& worldFromLocal, const AZ::Vector3& nonUniformScale, const AZ::Vector3& rayOrigin,
-        const AZ::Vector3& rayDirection, float rayLength, const AZ::Vector3& localStart, const AZ::Vector3& localEnd);
+        const AZ::Transform& worldFromLocal,
+        const AZ::Vector3& nonUniformScale,
+        const AZ::Vector3& rayOrigin,
+        const AZ::Vector3& rayDirection,
+        float rayLength,
+        const AZ::Vector3& localStart,
+        const AZ::Vector3& localEnd);
 } // namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/LinearManipulator.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/LinearManipulator.cpp
index 34ae28bd13..604e74b6f5 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/LinearManipulator.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/LinearManipulator.cpp
@@ -1,14 +1,14 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
 #include "LinearManipulator.h"
 
@@ -22,13 +22,16 @@
 namespace AzToolsFramework
 {
     LinearManipulator::Starter CalculateLinearManipulationDataStart(
-        const LinearManipulator::Fixed& fixed, const AZ::Transform& worldFromLocal, const AZ::Vector3& nonUniformScale,
-        const AZ::Transform& localTransform, const ViewportInteraction::MouseInteraction& interaction, const float intersectionDistance,
+        const LinearManipulator::Fixed& fixed,
+        const AZ::Transform& worldFromLocal,
+        const AZ::Vector3& nonUniformScale,
+        const AZ::Transform& localTransform,
+        const ViewportInteraction::MouseInteraction& interaction,
+        const float intersectionDistance,
         const AzFramework::CameraState& cameraState)
     {
-        const ManipulatorInteraction manipulatorInteraction =
-            BuildManipulatorInteraction(
-                worldFromLocal, nonUniformScale, interaction.m_mousePick.m_rayOrigin, interaction.m_mousePick.m_rayDirection);
+        const ManipulatorInteraction manipulatorInteraction = BuildManipulatorInteraction(
+            worldFromLocal, nonUniformScale, interaction.m_mousePick.m_rayOrigin, interaction.m_mousePick.m_rayDirection);
 
         const AZ::Vector3 axis = TransformDirectionNoScaling(localTransform, fixed.m_axis);
         const AZ::Vector3 rayCrossAxis = manipulatorInteraction.m_localRayDirection.Cross(axis);
@@ -47,32 +50,35 @@ namespace AzToolsFramework
             manipulatorInteraction.m_localRayOrigin + manipulatorInteraction.m_localRayDirection * intersectionDistance;
 
         Internal::CalculateRayPlaneIntersectingPoint(
-            manipulatorInteraction.m_localRayOrigin, manipulatorInteraction.m_localRayDirection,
-            localIntersectionPoint, startTransition.m_localNormal, start.m_localHitPosition);
+            manipulatorInteraction.m_localRayOrigin, manipulatorInteraction.m_localRayDirection, localIntersectionPoint,
+            startTransition.m_localNormal, start.m_localHitPosition);
 
         start.m_screenPosition = interaction.m_mousePick.m_screenCoordinates;
         start.m_localPosition = localTransform.GetTranslation();
-        start.m_localScale = AZ::Vector3(localTransform.GetUniformScale());;
+        start.m_localScale = AZ::Vector3(localTransform.GetUniformScale());
+        ;
         start.m_localAxis = axis;
         // sign to determine which side of the linear axis we pressed
         // (useful to know when the visual axis flips to face the camera)
-        start.m_sign =
-            AZ::GetSign((start.m_localHitPosition - localTransform.GetTranslation()).Dot(axis));
+        start.m_sign = AZ::GetSign((start.m_localHitPosition - localTransform.GetTranslation()).Dot(axis));
 
         startTransition.m_screenToWorldScale =
             1.0f / CalculateScreenToWorldMultiplier((worldFromLocal * localTransform).GetTranslation(), cameraState);
 
-        return {startTransition, start};
+        return { startTransition, start };
     }
 
     LinearManipulator::Action CalculateLinearManipulationDataAction(
-        const LinearManipulator::Fixed& fixed, const LinearManipulator::Starter& starter,
-        const AZ::Transform& worldFromLocal, const AZ::Vector3& nonUniformScale, const AZ::Transform& localTransform,
-        const GridSnapParameters& gridSnapParams, const ViewportInteraction::MouseInteraction& interaction)
+        const LinearManipulator::Fixed& fixed,
+        const LinearManipulator::Starter& starter,
+        const AZ::Transform& worldFromLocal,
+        const AZ::Vector3& nonUniformScale,
+        const AZ::Transform& localTransform,
+        const GridSnapParameters& gridSnapParams,
+        const ViewportInteraction::MouseInteraction& interaction)
     {
-        const ManipulatorInteraction manipulatorInteraction =
-            BuildManipulatorInteraction(
-                worldFromLocal, nonUniformScale, interaction.m_mousePick.m_rayOrigin, interaction.m_mousePick.m_rayDirection);
+        const ManipulatorInteraction manipulatorInteraction = BuildManipulatorInteraction(
+            worldFromLocal, nonUniformScale, interaction.m_mousePick.m_rayOrigin, interaction.m_mousePick.m_rayDirection);
 
         const auto& [startTransition, start] = starter;
 
@@ -81,8 +87,8 @@ namespace AzToolsFramework
         // if an invalid ray intersection is attempted
         AZ::Vector3 localHitPosition = start.m_localHitPosition;
         Internal::CalculateRayPlaneIntersectingPoint(
-            manipulatorInteraction.m_localRayOrigin, manipulatorInteraction.m_localRayDirection,
-            start.m_localHitPosition, startTransition.m_localNormal, localHitPosition);
+            manipulatorInteraction.m_localRayOrigin, manipulatorInteraction.m_localRayDirection, start.m_localHitPosition,
+            startTransition.m_localNormal, localHitPosition);
 
         localHitPosition = Internal::TryConstrainHitPositionToView(
             localHitPosition, start.m_localHitPosition, worldFromLocal.GetInverse(),
@@ -103,9 +109,8 @@ namespace AzToolsFramework
         LinearManipulator::Action action;
         action.m_fixed = fixed;
         action.m_start = start;
-        action.m_current.m_localPositionOffset = snapping
-            ? CalculateSnappedAmount(unsnappedOffset, axis, gridSize * scaleRecip)
-            : unsnappedOffset;
+        action.m_current.m_localPositionOffset =
+            snapping ? CalculateSnappedAmount(unsnappedOffset, axis, gridSize * scaleRecip) : unsnappedOffset;
         action.m_current.m_screenPosition = interaction.m_mousePick.m_screenCoordinates;
         action.m_viewportId = interaction.m_interactionId.m_viewportId;
 
@@ -191,7 +196,8 @@ namespace AzToolsFramework
 
             // note: m_localTransform must not be made uniform as it may contain a local scale we want to snap
             m_onLeftMouseUpCallback(CalculateLinearManipulationDataAction(
-                m_fixed, m_starter, TransformUniformScale(GetSpace()), GetNonUniformScale(), GetLocalTransform(), gridSnapParams, interaction));
+                m_fixed, m_starter, TransformUniformScale(GetSpace()), GetNonUniformScale(), GetLocalTransform(), gridSnapParams,
+                interaction));
         }
     }
 
@@ -202,16 +208,14 @@ namespace AzToolsFramework
         const ViewportInteraction::MouseInteraction& mouseInteraction)
     {
         const AZ::Transform localTransform = m_useVisualsOverride
-            ? AZ::Transform::CreateFromQuaternionAndTranslation(
-                m_visualOrientationOverride, GetLocalPosition())
+            ? AZ::Transform::CreateFromQuaternionAndTranslation(m_visualOrientationOverride, GetLocalPosition())
             : GetLocalTransform();
 
         if (cl_manipulatorDrawDebug)
         {
             if (PerformingAction())
             {
-                const GridSnapParameters gridSnapParams =
-                    GridSnapSettings(mouseInteraction.m_interactionId.m_viewportId);
+                const GridSnapParameters gridSnapParams = GridSnapSettings(mouseInteraction.m_interactionId.m_viewportId);
 
                 const auto action = CalculateLinearManipulationDataAction(
                     m_fixed, m_starter, TransformUniformScale(GetSpace()), GetNonUniformScale(), GetLocalTransform(), gridSnapParams,
@@ -219,9 +223,10 @@ namespace AzToolsFramework
 
                 // display the exact hit (ray intersection) of the mouse pick on the manipulator
                 DrawTransformAxes(
-                    debugDisplay, TransformUniformScale(GetSpace()) *
-                    AZ::Transform::CreateTranslation(
-                        action.m_start.m_localHitPosition + GetNonUniformScale() * action.m_current.m_localPositionOffset));
+                    debugDisplay,
+                    TransformUniformScale(GetSpace()) *
+                        AZ::Transform::CreateTranslation(
+                            action.m_start.m_localHitPosition + GetNonUniformScale() * action.m_current.m_localPositionOffset));
             }
 
             AZ::Transform combined = GetLocalTransform();
@@ -229,8 +234,7 @@ namespace AzToolsFramework
             combined = GetSpace() * combined;
 
             DrawTransformAxes(debugDisplay, combined);
-            DrawAxis(
-                debugDisplay, combined.GetTranslation(), TransformDirectionNoScaling(combined, m_fixed.m_axis));
+            DrawAxis(debugDisplay, combined.GetTranslation(), TransformDirectionNoScaling(combined, m_fixed.m_axis));
         }
 
         for (auto& view : m_manipulatorViews)
@@ -238,12 +242,9 @@ namespace AzToolsFramework
             auto nonUniformScale = GetNonUniformScale();
 
             view->Draw(
-                GetManipulatorManagerId(), managerState,
-                GetManipulatorId(), {
-                    ApplySpace(localTransform), GetNonUniformScale(),
-                    AZ::Vector3::CreateZero(), MouseOver()
-                },
-                debugDisplay, cameraState, mouseInteraction);
+                GetManipulatorManagerId(), managerState, GetManipulatorId(),
+                { ApplySpace(localTransform), GetNonUniformScale(), AZ::Vector3::CreateZero(), MouseOver() }, debugDisplay, cameraState,
+                mouseInteraction);
         }
     }
 
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/LinearManipulator.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/LinearManipulator.h
index c3d43a2535..240d4c7b9b 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/LinearManipulator.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/LinearManipulator.h
@@ -1,14 +1,14 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
 #pragma once
 
@@ -22,13 +22,13 @@ namespace AzToolsFramework
 {
     struct GridSnapParameters;
 
-    /// LinearManipulator serves as a visual tool for users to modify values
-    /// in one dimension on an axis defined in 3D space.
+    //! LinearManipulator serves as a visual tool for users to modify values
+    //! in one dimension on an axis defined in 3D space.
     class LinearManipulator
         : public BaseManipulator
         , public ManipulatorSpaceWithLocalTransform
     {
-        /// Private constructor.
+        //! Private constructor.
         explicit LinearManipulator(const AZ::Transform& worldFromLocal);
 
     public:
@@ -41,68 +41,80 @@ namespace AzToolsFramework
 
         ~LinearManipulator() = default;
 
-        /// A Manipulator must only be created and managed through a shared_ptr.
-        /// @note worldFromLocal should not contain scale.
+        //! A Manipulator must only be created and managed through a shared_ptr.
+        //! @note worldFromLocal should not contain scale.
         static AZStd::shared_ptr<LinearManipulator> MakeShared(const AZ::Transform& worldFromLocal);
 
-        /// Unchanging data set once for the linear manipulator.
+        //! Unchanging data set once for the linear manipulator.
         struct Fixed
         {
-            AZ::Vector3 m_axis = AZ::Vector3::CreateAxisX(); ///< The axis the manipulator will move along.
+            AZ::Vector3 m_axis = AZ::Vector3::CreateAxisX(); //!< The axis the manipulator will move along.
         };
 
-        /// Data passed between the initial press and first movement of the linear manipulator.
+        //! Data passed between the initial press and first movement of the linear manipulator.
         struct StartTransition
         {
-            /// The normal in local space of the manipulator when the mouse down event happens.
+            //! The normal in local space of the manipulator when the mouse down event happens.
             AZ::Vector3 m_localNormal;
-            /// Used to scale movement based on camera distance if we want screen space instead
-            /// of world space displacement.
+            //! Used to scale movement based on camera distance if we want screen space instead
+            //! of world space displacement.
             float m_screenToWorldScale;
         };
 
-        /// The state of the manipulator at the start of an interaction.
+        //! The state of the manipulator at the start of an interaction.
         struct Start
         {
-            AZ::Vector3 m_localPosition; ///< The current position of the manipulator in local space.
-            AZ::Vector3 m_localScale; ///< The current scale of the manipulator in local space.
-            AZ::Vector3 m_localHitPosition; ///< The intersection point in local space between the ray and the manipulator when the mouse down event happens.
-            AZ::Vector3 m_localAxis; ///< The axis in the local space of the manipulator itself.
-            float m_sign; ///< Used to determine which side of the axis we clicked on in case it's flipped to face the camera.
-            AzFramework::ScreenPoint m_screenPosition; ///< The initial position in screen space of the manipulator.
+            AZ::Vector3 m_localPosition; //!< The current position of the manipulator in local space.
+            AZ::Vector3 m_localScale; //!< The current scale of the manipulator in local space.
+            AZ::Vector3 m_localHitPosition; //!< The intersection point in local space between the ray and the manipulator when the mouse
+                                            //!< down event happens.
+            AZ::Vector3 m_localAxis; //!< The axis in the local space of the manipulator itself.
+            float m_sign; //!< Used to determine which side of the axis we clicked on in case it's flipped to face the camera.
+            AzFramework::ScreenPoint m_screenPosition; //!< The initial position in screen space of the manipulator.
         };
 
-        /// The state of the manipulator during an interaction.
+        //! The state of the manipulator during an interaction.
         struct Current
         {
-            AZ::Vector3 m_localPositionOffset; ///< The current offset of the manipulator from its starting position in local space.
-            AZ::Vector3 m_localScaleOffset; ///< The current offset of the manipulator from its starting scale in local space.
-            AzFramework::ScreenPoint m_screenPosition; ///< The current position in screen space of the manipulator.
+            AZ::Vector3 m_localPositionOffset; //!< The current offset of the manipulator from its starting position in local space.
+            AZ::Vector3 m_localScaleOffset; //!< The current offset of the manipulator from its starting scale in local space.
+            AzFramework::ScreenPoint m_screenPosition; //!< The current position in screen space of the manipulator.
         };
 
-        /// Mouse action data used by MouseActionCallback (wraps Fixed, Start and Current manipulator state).
+        //! Mouse action data used by MouseActionCallback (wraps Fixed, Start and Current manipulator state).
         struct Action
         {
             Fixed m_fixed;
             Start m_start;
             Current m_current;
             ViewportInteraction::KeyboardModifiers m_modifiers;
-            int m_viewportId; ///< The id of the viewport this manipulator is being used in.
-            AZ::Vector3 LocalScale() const { return m_start.m_localScale + m_current.m_localScaleOffset; }
-            AZ::Vector3 LocalScaleOffset() const { return m_current.m_localScaleOffset; }
-            AZ::Vector3 LocalPosition() const { return m_start.m_localPosition + m_current.m_localPositionOffset; }
-            AZ::Vector3 LocalPositionOffset() const { return m_current.m_localPositionOffset; }
+            int m_viewportId; //!< The id of the viewport this manipulator is being used in.
+            AZ::Vector3 LocalScale() const
+            {
+                return m_start.m_localScale + m_current.m_localScaleOffset;
+            }
+            AZ::Vector3 LocalScaleOffset() const
+            {
+                return m_current.m_localScaleOffset;
+            }
+            AZ::Vector3 LocalPosition() const
+            {
+                return m_start.m_localPosition + m_current.m_localPositionOffset;
+            }
+            AZ::Vector3 LocalPositionOffset() const
+            {
+                return m_current.m_localPositionOffset;
+            }
             AZ::Vector2 ScreenOffset() const
             {
-                return AzFramework::Vector2FromScreenVector(
-                    m_current.m_screenPosition - m_start.m_screenPosition);
+                return AzFramework::Vector2FromScreenVector(m_current.m_screenPosition - m_start.m_screenPosition);
             }
         };
 
-        /// This is the function signature of callbacks that will be invoked whenever a manipulator
-        /// is clicked on or dragged.
+        //! This is the function signature of callbacks that will be invoked whenever a manipulator
+        //! is clicked on or dragged.
         using MouseActionCallback = AZStd::function<void(const Action&)>;
-        /// Tuple of StartTransition (initial mouse down to mouse move) and Start state.
+        //! Tuple of StartTransition (initial mouse down to mouse move) and Start state.
         using Starter = AZStd::tuple<StartTransition, Start>;
 
         void InstallLeftMouseDownCallback(const MouseActionCallback& onMouseDownCallback);
@@ -116,7 +128,10 @@ namespace AzToolsFramework
             const ViewportInteraction::MouseInteraction& mouseInteraction) override;
 
         void SetAxis(const AZ::Vector3& axis);
-        const AZ::Vector3& GetAxis() const { return m_fixed.m_axis; }
+        const AZ::Vector3& GetAxis() const
+        {
+            return m_fixed.m_axis;
+        }
 
         template<typename Views>
         void SetViews(Views&& views)
@@ -135,12 +150,9 @@ namespace AzToolsFramework
         }
 
     private:
-        void OnLeftMouseDownImpl(
-            const ViewportInteraction::MouseInteraction& interaction, float rayIntersectionDistance) override;
-        void OnLeftMouseUpImpl(
-            const ViewportInteraction::MouseInteraction& interaction) override;
-        void OnMouseMoveImpl(
-            const ViewportInteraction::MouseInteraction& interaction) override;
+        void OnLeftMouseDownImpl(const ViewportInteraction::MouseInteraction& interaction, float rayIntersectionDistance) override;
+        void OnLeftMouseUpImpl(const ViewportInteraction::MouseInteraction& interaction) override;
+        void OnMouseMoveImpl(const ViewportInteraction::MouseInteraction& interaction) override;
 
         void InvalidateImpl() override;
         void SetBoundsDirtyImpl() override;
@@ -155,16 +167,24 @@ namespace AzToolsFramework
         MouseActionCallback m_onLeftMouseUpCallback = nullptr;
         MouseActionCallback m_onMouseMoveCallback = nullptr;
 
-        ManipulatorViews m_manipulatorViews; ///< Look of manipulator.
+        ManipulatorViews m_manipulatorViews; //!< Look of manipulator.
     };
 
     LinearManipulator::Starter CalculateLinearManipulationDataStart(
-        const LinearManipulator::Fixed& fixed, const AZ::Transform& worldFromLocal, const AZ::Vector3& nonUniformScale,
-        const AZ::Transform& localTransform, const ViewportInteraction::MouseInteraction& interaction, float intersectionDistance,
+        const LinearManipulator::Fixed& fixed,
+        const AZ::Transform& worldFromLocal,
+        const AZ::Vector3& nonUniformScale,
+        const AZ::Transform& localTransform,
+        const ViewportInteraction::MouseInteraction& interaction,
+        float intersectionDistance,
         const AzFramework::CameraState& cameraState);
 
     LinearManipulator::Action CalculateLinearManipulationDataAction(
-        const LinearManipulator::Fixed& fixed, const LinearManipulator::Starter& starter,
-        const AZ::Transform& worldFromLocal, const AZ::Vector3& nonUniformScale, const AZ::Transform& localTransform,
-        const GridSnapParameters& gridSnapParams, const ViewportInteraction::MouseInteraction& interaction);
+        const LinearManipulator::Fixed& fixed,
+        const LinearManipulator::Starter& starter,
+        const AZ::Transform& worldFromLocal,
+        const AZ::Vector3& nonUniformScale,
+        const AZ::Transform& localTransform,
+        const GridSnapParameters& gridSnapParams,
+        const ViewportInteraction::MouseInteraction& interaction);
 } // namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorBus.h
index 7768368d6b..a79a14abc2 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorBus.h
@@ -1,14 +1,14 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
 #pragma once
 
@@ -26,56 +26,55 @@ namespace AzToolsFramework
     using ManipulatorManagerId = IdType<struct ManipulatorManagerType>;
     static const ManipulatorManagerId InvalidManipulatorManagerId = ManipulatorManagerId(0);
 
-    /// EBus interface used to send requests to ManipulatorManager.
-    class ManipulatorManagerRequests
-        : public AZ::EBusTraits
+    //! EBus interface used to send requests to ManipulatorManager.
+    class ManipulatorManagerRequests : public AZ::EBusTraits
     {
     public:
-        static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::ById; /**< We can have multiple manipulator managers.
-                                                                                             In the case where there are multiple viewports, each displaying
-                                                                                             a different set of entities, a different manipulator manager is required
-                                                                                             to provide a different collision space for each viewport so that mouse
-                                                                                             hit detection can be handled properly. */
+        //! We can have multiple manipulator managers.
+        //! In the case where there are multiple viewports, each displaying
+        //! a different set of entities, a different manipulator manager is required
+        //! to provide a different collision space for each viewport so that mouse
+        //! hit detection can be handled properly.
+        static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::ById;
         using BusIdType = ManipulatorManagerId;
 
         static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
 
         virtual ~ManipulatorManagerRequests() = default;
 
-        /// Register a manipulator with the Manipulator Manager.
-        /// @param manipulator The manipulator parameter is passed as a shared_ptr so
-        /// that the system responsible for managing manipulators can maintain ownership
-        /// of the manipulator even if is destroyed while in use.
+        //! Register a manipulator with the Manipulator Manager.
+        //! @param manipulator The manipulator parameter is passed as a shared_ptr so
+        //! that the system responsible for managing manipulators can maintain ownership
+        //! of the manipulator even if is destroyed while in use.
         virtual void RegisterManipulator(AZStd::shared_ptr<BaseManipulator> manipulator) = 0;
 
-        /// Unregister a manipulator from the Manipulator Manager.
-        /// After unregistering the manipulator, it will be excluded from mouse hit detection
-        /// and will not receive any mouse action events. The Manipulator Manager will also
-        /// relinquish ownership of the manipulator.
+        //! Unregister a manipulator from the Manipulator Manager.
+        //! After unregistering the manipulator, it will be excluded from mouse hit detection
+        //! and will not receive any mouse action events. The Manipulator Manager will also
+        //! relinquish ownership of the manipulator.
         virtual void UnregisterManipulator(BaseManipulator* manipulator) = 0;
 
-        /// Delete a manipulator bound.
+        //! Delete a manipulator bound.
         virtual void DeleteManipulatorBound(Picking::RegisteredBoundId boundId) = 0;
 
-        /// Mark the bound of a manipulator dirty so it's excluded from mouse hit detection.
-        /// This should be called whenever a manipulator is moved.
+        //! Mark the bound of a manipulator dirty so it's excluded from mouse hit detection.
+        //! This should be called whenever a manipulator is moved.
         virtual void SetBoundDirty(Picking::RegisteredBoundId boundId) = 0;
 
-        /// Returns true if the manipulator manager is currently interacting, otherwise false.
+        //! Returns true if the manipulator manager is currently interacting, otherwise false.
         virtual bool Interacting() const = 0;
 
-        /// Update the bound for a manipulator.
-        /// If \ref boundId hasn't been registered before or it's invalid, a new bound is created and set using \ref boundShapeData
-        /// @param manipulatorId The id of the manipulator whose bound needs to update.
-        /// @param boundId The id of the bound that needs to update.
-        /// @param boundShapeData The pointer to the new bound shape data.
-        /// @return If \ref boundId has been registered return the same id, otherwise create a new bound and return its id.
+        //! Update the bound for a manipulator.
+        //! If \ref boundId hasn't been registered before or it's invalid, a new bound is created and set using \ref boundShapeData.
+        //! @param manipulatorId The id of the manipulator whose bound needs to update.
+        //! @param boundId The id of the bound that needs to update.
+        //! @param boundShapeData The pointer to the new bound shape data.
+        //! @return If \ref boundId has been registered return the same id, otherwise create a new bound and return its id.
         virtual Picking::RegisteredBoundId UpdateBound(
-            ManipulatorId manipulatorId, Picking::RegisteredBoundId boundId,
-            const Picking::BoundRequestShapeBase& boundShapeData) = 0;
+            ManipulatorId manipulatorId, Picking::RegisteredBoundId boundId, const Picking::BoundRequestShapeBase& boundShapeData) = 0;
     };
 
-    /// Type to inherit to implement ManipulatorManagerRequests.
+    //! Type to inherit to implement ManipulatorManagerRequests.
     using ManipulatorManagerRequestBus = AZ::EBus<ManipulatorManagerRequests>;
 
-}//namespace AzToolsFramework
+} // namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorManager.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorManager.cpp
index c856c5f9a8..3a6a2487c3 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorManager.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorManager.cpp
@@ -1,17 +1,17 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
-#include "BaseManipulator.h"
 #include "ManipulatorManager.h"
+#include "BaseManipulator.h"
 
 #include <AzCore/std/tuple.h>
 #include <AzToolsFramework/Picking/BoundInterface.h>
@@ -51,7 +51,8 @@ namespace AzToolsFramework
 
         if (manipulator->Registered())
         {
-            AZ_Assert(manipulator->GetManipulatorManagerId() == m_manipulatorManagerId,
+            AZ_Assert(
+                manipulator->GetManipulatorManagerId() == m_manipulatorManagerId,
                 "This manipulator was registered with a different manipulator manager!");
             return;
         }
@@ -75,8 +76,7 @@ namespace AzToolsFramework
     }
 
     Picking::RegisteredBoundId ManipulatorManager::UpdateBound(
-        const ManipulatorId manipulatorId, const Picking::RegisteredBoundId boundId,
-        const Picking::BoundRequestShapeBase& boundShapeData)
+        const ManipulatorId manipulatorId, const Picking::RegisteredBoundId boundId, const Picking::BoundRequestShapeBase& boundShapeData)
     {
         AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
 
@@ -99,8 +99,7 @@ namespace AzToolsFramework
             AZ_Assert(boundItr->second == manipulatorId, "Manipulator and its bounds are out of synchronization!");
         }
 
-        const Picking::RegisteredBoundId newBoundId =
-            m_boundManager.UpdateOrRegisterBound(boundShapeData, boundId);
+        const Picking::RegisteredBoundId newBoundId = m_boundManager.UpdateOrRegisterBound(boundShapeData, boundId);
 
         if (newBoundId != boundId)
         {
@@ -142,13 +141,6 @@ namespace AzToolsFramework
         }
     }
 
-    void ManipulatorManager::CheckModifierKeysChanged(
-        [[maybe_unused]] const ViewportInteraction::KeyboardModifiers keyboardModifiers,
-        const ViewportInteraction::MousePick& mousePick)
-    {
-        RefreshMouseOverState(mousePick);
-    }
-
     void ManipulatorManager::DrawManipulators(
         AzFramework::DebugDisplayRequests& debugDisplay,
         const AzFramework::CameraState& cameraState,
@@ -181,7 +173,8 @@ namespace AzToolsFramework
             if (found != m_boundIdToManipulatorIdMap.end())
             {
                 const auto manipulatorFound = m_manipulatorIdToPtrMap.find(found->second);
-                AZ_Assert(manipulatorFound != m_manipulatorIdToPtrMap.end(),
+                AZ_Assert(
+                    manipulatorFound != m_manipulatorIdToPtrMap.end(),
                     "Found a bound without a corresponding Manipulator, "
                     "it's likely a bound was not cleaned up correctly");
                 rayIntersectionDistance = hitItr.second;
@@ -194,10 +187,9 @@ namespace AzToolsFramework
 
     bool ManipulatorManager::ConsumeViewportMousePress(const ViewportInteraction::MouseInteraction& interaction)
     {
-        if (auto pickedManipulator = PickManipulator(interaction.m_mousePick);
-            pickedManipulator.has_value())
+        if (auto pickedManipulator = PickManipulator(interaction.m_mousePick); pickedManipulator.has_value())
         {
-            auto[manipulator, intersectionDistance] = pickedManipulator.value();
+            auto [manipulator, intersectionDistance] = pickedManipulator.value();
 
             if (interaction.m_mouseButtons.Left())
             {
@@ -249,24 +241,19 @@ namespace AzToolsFramework
         const ViewportInteraction::MousePick& mousePick)
     {
         float intersectionDistance = 0.0f;
-        const AZStd::shared_ptr<BaseManipulator> pickedManipulator = PerformRaycast(
-            mousePick.m_rayOrigin, mousePick.m_rayDirection, intersectionDistance);
+        const AZStd::shared_ptr<BaseManipulator> pickedManipulator =
+            PerformRaycast(mousePick.m_rayOrigin, mousePick.m_rayDirection, intersectionDistance);
 
-        return pickedManipulator.get() != nullptr
-            ? AZStd::make_optional(AZStd::make_tuple(pickedManipulator, intersectionDistance))
-            : AZStd::nullopt;
+        return pickedManipulator.get() != nullptr ? AZStd::make_optional(AZStd::make_tuple(pickedManipulator, intersectionDistance))
+                                                  : AZStd::nullopt;
     }
 
-    ManipulatorManager::PickedManipulatorId ManipulatorManager::PickManipulatorId(
-        const ViewportInteraction::MousePick& mousePick)
+    ManipulatorManager::PickedManipulatorId ManipulatorManager::PickManipulatorId(const ViewportInteraction::MousePick& mousePick)
     {
-        auto [manipulator, intersectionDistance] =
-            PickManipulator(mousePick).value_or(PickedManipulator(nullptr, 0.0f));
-        const ManipulatorId pickedManipulatorId = manipulator
-            ? manipulator->GetManipulatorId()
-            : InvalidManipulatorId;
+        auto [manipulator, intersectionDistance] = PickManipulator(mousePick).value_or(PickedManipulator(nullptr, 0.0f));
+        const ManipulatorId pickedManipulatorId = manipulator ? manipulator->GetManipulatorId() : InvalidManipulatorId;
 
-        return PickedManipulatorId{pickedManipulatorId, intersectionDistance};
+        return PickedManipulatorId{ pickedManipulatorId, intersectionDistance };
     }
 
     ManipulatorManager::ConsumeMouseMoveResult ManipulatorManager::ConsumeViewportMouseMove(
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorManager.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorManager.h
index 5f57738b8c..66b38579ef 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorManager.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorManager.h
@@ -1,14 +1,14 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
 #pragma once
 
@@ -23,7 +23,7 @@ namespace AzFramework
 {
     struct CameraState;
     class DebugDisplayRequests;
-}
+} // namespace AzFramework
 
 namespace AzToolsFramework
 {
@@ -40,15 +40,15 @@ namespace AzToolsFramework
     class BaseManipulator;
     class LinearManipulator;
 
-    /// State of overall manipulator manager.
+    //! State of overall manipulator manager.
     struct ManipulatorManagerState
     {
         bool m_interacting;
     };
 
-    /// This class serves to manage all relevant mouse events and coordinate all registered manipulators to function properly.
-    /// ManipulatorManager does not manage the life cycle of specific manipulators. The users of manipulators are responsible
-    /// for creating and deleting them at right time, as well as registering and unregistering accordingly.
+    //! This class serves to manage all relevant mouse events and coordinate all registered manipulators to function properly.
+    //! ManipulatorManager does not manage the life cycle of specific manipulators. The users of manipulators are responsible
+    //! for creating and deleting them at right time, as well as registering and unregistering accordingly.
     class ManipulatorManager
         : private ManipulatorManagerRequestBus::Handler
         , private EditorEntityInfoNotificationBus::Handler
@@ -59,7 +59,7 @@ namespace AzToolsFramework
         explicit ManipulatorManager(ManipulatorManagerId managerId);
         ~ManipulatorManager();
 
-        /// The result of consuming a mouse move.
+        //! The result of consuming a mouse move.
         enum class ConsumeMouseMoveResult
         {
             None,
@@ -80,57 +80,52 @@ namespace AzToolsFramework
         void DeleteManipulatorBound(Picking::RegisteredBoundId boundId) override;
         void SetBoundDirty(Picking::RegisteredBoundId boundId) override;
         Picking::RegisteredBoundId UpdateBound(
-            ManipulatorId manipulatorId, Picking::RegisteredBoundId boundId,
-            const Picking::BoundRequestShapeBase& boundShapeData) override;
-        bool Interacting() const override { return m_activeManipulator != nullptr; }
+            ManipulatorId manipulatorId, Picking::RegisteredBoundId boundId, const Picking::BoundRequestShapeBase& boundShapeData) override;
+        bool Interacting() const override
+        {
+            return m_activeManipulator != nullptr;
+        }
 
         void DrawManipulators(
             AzFramework::DebugDisplayRequests& debugDisplay,
             const AzFramework::CameraState& cameraState,
             const ViewportInteraction::MouseInteraction& mouseInteraction);
 
-        // O3DE_DEPRECATED(LY-117150)
-        /// Check if the modifier key state has changed - if so we may need to refresh
-        /// certain manipulator bounds.
-        AZ_DEPRECATED(
-            void CheckModifierKeysChanged(
-                ViewportInteraction::KeyboardModifiers keyboardModifiers,
-                const ViewportInteraction::MousePick& mousePick),
-            "CheckModifierKeysChanged is deprecated and will be removed in a future release");
-
     protected:
-        /// @param rayOrigin The origin of the ray to test intersection with.
-        /// @param rayDirection The direction of the ray to test intersection with.
-        /// @param[out] rayIntersectionDistance The result intersecting point equals "rayOrigin + rayIntersectionDistance * rayDirection".
-        /// @return A pointer to a manipulator that the ray intersects. Null pointer if no intersection is detected.
+        //! @param rayOrigin The origin of the ray to test intersection with.
+        //! @param rayDirection The direction of the ray to test intersection with.
+        //! @param[out] rayIntersectionDistance The result intersecting point equals "rayOrigin + rayIntersectionDistance * rayDirection".
+        //! @return A pointer to a manipulator that the ray intersects. Null pointer if no intersection is detected.
         AZStd::shared_ptr<BaseManipulator> PerformRaycast(
             const AZ::Vector3& rayOrigin, const AZ::Vector3& rayDirection, float& rayIntersectionDistance);
 
         // EditorEntityInfoNotifications ...
         void OnEntityInfoUpdatedVisibility(AZ::EntityId entityId, bool visible) override;
 
-        /// Alias for a Manipulator and intersection distance.
+        //! Alias for a Manipulator and intersection distance.
         using PickedManipulator = AZStd::tuple<AZStd::shared_ptr<BaseManipulator>, float>;
-        /// Alias for a ManipulatorId and intersection distance.
+        //! Alias for a ManipulatorId and intersection distance.
         using PickedManipulatorId = AZStd::tuple<ManipulatorId, float>;
 
-        /// Return the picked manipulator and intersection distance if a manipulator was intersected.
+        //! Return the picked manipulator and intersection distance if a manipulator was intersected.
         AZStd::optional<PickedManipulator> PickManipulator(const ViewportInteraction::MousePick& mousePick);
-        /// Wrapper for PickManipulator to return the ManipulatorId directly.
+        //! Wrapper for PickManipulator to return the ManipulatorId directly.
         PickedManipulatorId PickManipulatorId(const ViewportInteraction::MousePick& mousePick);
 
-        /// Called once per frame after all manipulators have been drawn (and their
-        /// bounds updated if required).
+        //! Called once per frame after all manipulators have been drawn (and their
+        //! bounds updated if required).
         void RefreshMouseOverState(const ViewportInteraction::MousePick& mousePick);
 
-        ManipulatorManagerId m_manipulatorManagerId; ///< This manipulator manager's id.
-        ManipulatorId m_nextManipulatorIdToGenerate; ///< Id to use for the next manipulator that is registered with this manager.
+        ManipulatorManagerId m_manipulatorManagerId; //!< This manipulator manager's id.
+        ManipulatorId m_nextManipulatorIdToGenerate; //!< Id to use for the next manipulator that is registered with this manager.
 
-        AZStd::unordered_map<ManipulatorId, AZStd::shared_ptr<BaseManipulator>> m_manipulatorIdToPtrMap; ///< Mapping from a manipulatorId to the corresponding manipulator.
-        AZStd::unordered_map<Picking::RegisteredBoundId, ManipulatorId> m_boundIdToManipulatorIdMap; ///< Mapping from a boundId to the corresponding manipulatorId.
+        AZStd::unordered_map<ManipulatorId, AZStd::shared_ptr<BaseManipulator>>
+            m_manipulatorIdToPtrMap; //!< Mapping from a manipulatorId to the corresponding manipulator.
+        AZStd::unordered_map<Picking::RegisteredBoundId, ManipulatorId>
+            m_boundIdToManipulatorIdMap; //!< Mapping from a boundId to the corresponding manipulatorId.
 
-        AZStd::shared_ptr<BaseManipulator> m_activeManipulator; ///< The manipulator we are currently interacting with.
-        Picking::ManipulatorBoundManager m_boundManager; ///< All active manipulator bounds that could be interacted with.
+        AZStd::shared_ptr<BaseManipulator> m_activeManipulator; //!< The manipulator we are currently interacting with.
+        Picking::ManipulatorBoundManager m_boundManager; //!< All active manipulator bounds that could be interacted with.
     };
 
     // The main/default ManipulatorManagerId to be used for
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorSnapping.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorSnapping.cpp
index 8a6398d025..427bb9e9d1 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorSnapping.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorSnapping.cpp
@@ -1,14 +1,14 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
 #include "ManipulatorSnapping.h"
 
@@ -19,19 +19,27 @@
 #include <AzToolsFramework/Viewport/ViewportMessages.h>
 
 AZ_CVAR(
-    AZ::Color, cl_viewportGridMainColor, AZ::Color::CreateFromRgba(26, 26, 26, 127), nullptr,
-    AZ::ConsoleFunctorFlags::Null, "Main color for snapping grid");
+    AZ::Color,
+    cl_viewportGridMainColor,
+    AZ::Color::CreateFromRgba(26, 26, 26, 127),
+    nullptr,
+    AZ::ConsoleFunctorFlags::Null,
+    "Main color for snapping grid");
 AZ_CVAR(
-    AZ::Color, cl_viewportGridFadeColor, AZ::Color::CreateFromRgba(127, 127, 127, 0), nullptr,
-    AZ::ConsoleFunctorFlags::Null, "Fade color for snapping grid");
+    AZ::Color,
+    cl_viewportGridFadeColor,
+    AZ::Color::CreateFromRgba(127, 127, 127, 0),
+    nullptr,
+    AZ::ConsoleFunctorFlags::Null,
+    "Fade color for snapping grid");
+AZ_CVAR(int, cl_viewportGridSquareCount, 20, nullptr, AZ::ConsoleFunctorFlags::Null, "Number of grid squares for snapping grid");
+AZ_CVAR(float, cl_viewportGridLineWidth, 1.0f, nullptr, AZ::ConsoleFunctorFlags::Null, "Width of grid lines for snapping grid");
 AZ_CVAR(
-    int, cl_viewportGridSquareCount, 20, nullptr, AZ::ConsoleFunctorFlags::Null,
-    "Number of grid squares for snapping grid");
-AZ_CVAR(
-    float, cl_viewportGridLineWidth, 1.0f, nullptr, AZ::ConsoleFunctorFlags::Null,
-    "Width of grid lines for snapping grid");
-AZ_CVAR(
-    float, cl_viewportFadeLineDistanceScale, 1.0f, nullptr, AZ::ConsoleFunctorFlags::Null,
+    float,
+    cl_viewportFadeLineDistanceScale,
+    1.0f,
+    nullptr,
+    AZ::ConsoleFunctorFlags::Null,
     "The scale to be applied to the line that fades out (scales the current gridSize)");
 
 namespace AzToolsFramework
@@ -43,16 +51,17 @@ namespace AzToolsFramework
     }
 
     ManipulatorInteraction BuildManipulatorInteraction(
-        const AZ::Transform& worldFromLocal, const AZ::Vector3& nonUniformScale,
-        const AZ::Vector3& worldRayOrigin, const AZ::Vector3& worldRayDirection)
+        const AZ::Transform& worldFromLocal,
+        const AZ::Vector3& nonUniformScale,
+        const AZ::Vector3& worldRayOrigin,
+        const AZ::Vector3& worldRayDirection)
     {
         const AZ::Transform worldFromLocalUniform = AzToolsFramework::TransformUniformScale(worldFromLocal);
         const AZ::Transform localFromWorldUniform = worldFromLocalUniform.GetInverse();
 
-        return {localFromWorldUniform.TransformPoint(worldRayOrigin),
-                TransformDirectionNoScaling(localFromWorldUniform, worldRayDirection),
-                NonUniformScaleReciprocal(nonUniformScale),
-                ScaleReciprocal(worldFromLocalUniform)};
+        return { localFromWorldUniform.TransformPoint(worldRayOrigin),
+                 TransformDirectionNoScaling(localFromWorldUniform, worldRayDirection), NonUniformScaleReciprocal(nonUniformScale),
+                 ScaleReciprocal(worldFromLocalUniform) };
     }
 
     struct SnapAdjustment
@@ -87,8 +96,7 @@ namespace AzToolsFramework
     }
 
     AZ::Vector3 CalculateSnappedTerrainPosition(
-        const AZ::Vector3& worldSurfacePosition, const AZ::Transform& worldFromLocal,
-        const int viewportId, const float gridSize)
+        const AZ::Vector3& worldSurfacePosition, const AZ::Transform& worldFromLocal, const int viewportId, const float gridSize)
     {
         const AZ::Transform localFromWorld = worldFromLocal.GetInverse();
         const AZ::Vector3 localSurfacePosition = localFromWorld.TransformPoint(worldSurfacePosition);
@@ -101,8 +109,7 @@ namespace AzToolsFramework
         // find terrain height at xy snapped location
         float terrainHeight = 0.0f;
         ViewportInteraction::MainEditorViewportInteractionRequestBus::EventResult(
-            terrainHeight, viewportId,
-            &ViewportInteraction::MainEditorViewportInteractionRequestBus::Events::TerrainHeight,
+            terrainHeight, viewportId, &ViewportInteraction::MainEditorViewportInteractionRequestBus::Events::TerrainHeight,
             Vector3ToVector2(worldFromLocal.TransformPoint(localSnappedSurfacePosition)));
 
         // set snapped z value to terrain height
@@ -116,8 +123,7 @@ namespace AzToolsFramework
     {
         bool snapping = false;
         ViewportInteraction::ViewportInteractionRequestBus::EventResult(
-            snapping, viewportId,
-            &ViewportInteraction::ViewportInteractionRequestBus::Events::GridSnappingEnabled);
+            snapping, viewportId, &ViewportInteraction::ViewportInteractionRequestBus::Events::GridSnappingEnabled);
 
         return snapping;
     }
@@ -126,8 +132,7 @@ namespace AzToolsFramework
     {
         float gridSize = 0.0f;
         ViewportInteraction::ViewportInteractionRequestBus::EventResult(
-            gridSize, viewportId,
-            &ViewportInteraction::ViewportInteractionRequestBus::Events::GridSize);
+            gridSize, viewportId, &ViewportInteraction::ViewportInteractionRequestBus::Events::GridSize);
 
         return gridSize;
     }
@@ -136,7 +141,8 @@ namespace AzToolsFramework
     {
         bool snapping = GridSnapping(viewportId);
         const float gridSize = GridSize(viewportId);
-        if (AZ::IsClose(gridSize, 0.0f, 1e-2f)) // Same threshold value as min value for m_spinBox in SnapToWidget constructor in MainWindow.cpp
+        if (AZ::IsClose(
+                gridSize, 0.0f, 1e-2f)) // Same threshold value as min value for m_spinBox in SnapToWidget constructor in MainWindow.cpp
         {
             snapping = false;
         }
@@ -148,8 +154,7 @@ namespace AzToolsFramework
     {
         bool snapping = false;
         ViewportInteraction::ViewportInteractionRequestBus::EventResult(
-            snapping, viewportId,
-            &ViewportInteraction::ViewportInteractionRequestBus::Events::AngleSnappingEnabled);
+            snapping, viewportId, &ViewportInteraction::ViewportInteractionRequestBus::Events::AngleSnappingEnabled);
 
         return snapping;
     }
@@ -158,8 +163,7 @@ namespace AzToolsFramework
     {
         float angle = 0.0f;
         ViewportInteraction::ViewportInteractionRequestBus::EventResult(
-            angle, viewportId,
-            &ViewportInteraction::ViewportInteractionRequestBus::Events::AngleStep);
+            angle, viewportId, &ViewportInteraction::ViewportInteractionRequestBus::Events::AngleStep);
 
         return angle;
     }
@@ -168,14 +172,12 @@ namespace AzToolsFramework
     {
         bool show = false;
         ViewportInteraction::ViewportInteractionRequestBus::EventResult(
-            show, viewportId,
-            &ViewportInteraction::ViewportInteractionRequestBus::Events::ShowGrid);
+            show, viewportId, &ViewportInteraction::ViewportInteractionRequestBus::Events::ShowGrid);
 
         return show;
     }
 
-    void DrawSnappingGrid(
-        AzFramework::DebugDisplayRequests& debugDisplay, const AZ::Transform& worldFromLocal, const float squareSize)
+    void DrawSnappingGrid(AzFramework::DebugDisplayRequests& debugDisplay, const AZ::Transform& worldFromLocal, const float squareSize)
     {
         debugDisplay.PushMatrix(worldFromLocal);
 
@@ -197,21 +199,17 @@ namespace AzToolsFramework
 
             // draw the faded end parts of the grid lines
             debugDisplay.DrawLine(
-                AZ::Vector3(lineOffset, -halfGridSize, 0.0f),
-                AZ::Vector3(lineOffset, -(halfGridSize + fadeLineLength), 0.0f),
+                AZ::Vector3(lineOffset, -halfGridSize, 0.0f), AZ::Vector3(lineOffset, -(halfGridSize + fadeLineLength), 0.0f),
                 gridMainColor, gridFadeColor);
             debugDisplay.DrawLine(
-                AZ::Vector3(lineOffset, halfGridSize, 0.0f),
-                AZ::Vector3(lineOffset, (halfGridSize + fadeLineLength), 0.0f),
+                AZ::Vector3(lineOffset, halfGridSize, 0.0f), AZ::Vector3(lineOffset, (halfGridSize + fadeLineLength), 0.0f), gridMainColor,
+                gridFadeColor);
+            debugDisplay.DrawLine(
+                AZ::Vector3(-halfGridSize, lineOffset, 0.0f), AZ::Vector3(-(halfGridSize + fadeLineLength), lineOffset, 0.0f),
                 gridMainColor, gridFadeColor);
             debugDisplay.DrawLine(
-                AZ::Vector3(-halfGridSize, lineOffset, 0.0f),
-                AZ::Vector3(-(halfGridSize + fadeLineLength), lineOffset, 0.0f),
-                gridMainColor, gridFadeColor);
-            debugDisplay.DrawLine(
-                AZ::Vector3(halfGridSize, lineOffset, 0.0f),
-                AZ::Vector3((halfGridSize + fadeLineLength), lineOffset, 0.0f),
-                gridMainColor, gridFadeColor);
+                AZ::Vector3(halfGridSize, lineOffset, 0.0f), AZ::Vector3((halfGridSize + fadeLineLength), lineOffset, 0.0f), gridMainColor,
+                gridFadeColor);
 
             // build a vector of the main grid lines to draw (start and end positions)
             lines.push_back(AZ::Vector3(lineOffset, -halfGridSize, 0.0f));
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorSnapping.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorSnapping.h
index 11860780c7..f2fa104d4c 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorSnapping.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorSnapping.h
@@ -1,19 +1,19 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
 #pragma once
 
-#include <AzCore/Math/Vector3.h>
 #include <AzCore/Math/Transform.h>
+#include <AzCore/Math/Vector3.h>
 
 namespace AzFramework
 {
@@ -22,7 +22,7 @@ namespace AzFramework
 
 namespace AzToolsFramework
 {
-    /// Structure to encapsulate grid snapping properties.
+    //! Structure to encapsulate grid snapping properties.
     struct GridSnapParameters
     {
         GridSnapParameters(bool gridSnap, float gridSize);
@@ -31,96 +31,92 @@ namespace AzToolsFramework
         float m_gridSize;
     };
 
-    /// Structure to hold transformed incoming viewport interaction from world space to manipulator space.
+    //! Structure to hold transformed incoming viewport interaction from world space to manipulator space.
     struct ManipulatorInteraction
     {
-        AZ::Vector3 m_localRayOrigin; ///< The ray origin (start) in the reference from of the manipulator.
-        AZ::Vector3 m_localRayDirection; ///< The ray direction in the reference from of the manipulator.
-        AZ::Vector3 m_nonUniformScaleReciprocal; ///< Handles inverting any non-uniform scale which was applied
-                                                 ///< separately from the transform.
-        float m_scaleReciprocal; ///< The scale reciprocal (1.0 / scale) of the transform used to move the
-                                 ///< ray from world space to local space.
+        AZ::Vector3 m_localRayOrigin; //!< The ray origin (start) in the reference from of the manipulator.
+        AZ::Vector3 m_localRayDirection; //!< The ray direction in the reference from of the manipulator.
+        AZ::Vector3 m_nonUniformScaleReciprocal; //!< Handles inverting any non-uniform scale which was applied
+                                                 //!< separately from the transform.
+        float m_scaleReciprocal; //!< The scale reciprocal (1.0 / scale) of the transform used to move the
+                                 //!< ray from world space to local space.
     };
 
-    /// Build a ManipulatorInteraction structure from the incoming viewport interaction.
+    //! Build a ManipulatorInteraction structure from the incoming viewport interaction.
     ManipulatorInteraction BuildManipulatorInteraction(
-        const AZ::Transform& worldFromLocal, const AZ::Vector3& nonUniformScale,
-        const AZ::Vector3& worldRayOrigin, const AZ::Vector3& worldRayDirection);
+        const AZ::Transform& worldFromLocal,
+        const AZ::Vector3& nonUniformScale,
+        const AZ::Vector3& worldRayOrigin,
+        const AZ::Vector3& worldRayDirection);
 
-    /// Calculate the offset along an axis to adjust a position to stay snapped to a given grid size.
-    /// @note This is snap up or down to the nearest grid segment (e.g. 0.2 snaps to 0.0 -> delta 0.2,
-    /// 0.7 snaps to 1.0 -> delta 0.3).
-    AZ::Vector3 CalculateSnappedOffset(
-        const AZ::Vector3& unsnappedPosition, const AZ::Vector3& axis, float size);
+    //! Calculate the offset along an axis to adjust a position to stay snapped to a given grid size.
+    //! @note This is snap up or down to the nearest grid segment (e.g. 0.2 snaps to 0.0 -> delta 0.2,
+    //! 0.7 snaps to 1.0 -> delta 0.3).
+    AZ::Vector3 CalculateSnappedOffset(const AZ::Vector3& unsnappedPosition, const AZ::Vector3& axis, float size);
 
-    /// Return the amount to snap from the starting position given the current grid size.
-    /// @note A movement of more than half size (in either direction) will cause a snap by size.
+    //! Return the amount to snap from the starting position given the current grid size.
+    //! @note A movement of more than half size (in either direction) will cause a snap by size.
     AZ::Vector3 CalculateSnappedAmount(const AZ::Vector3& unsnappedPosition, const AZ::Vector3& axis, float size);
 
-    /// For a given point on the terrain, calculate the closest xy position snapped to the grid
-    /// (z position is aligned to terrain height, not snapped to z grid)
+    //! For a given point on the terrain, calculate the closest xy position snapped to the grid
+    //! (z position is aligned to terrain height, not snapped to z grid)
     AZ::Vector3 CalculateSnappedTerrainPosition(
-        const AZ::Vector3& worldSurfacePosition, const AZ::Transform& worldFromLocal,
-        int viewportId, float gridSize);
+        const AZ::Vector3& worldSurfacePosition, const AZ::Transform& worldFromLocal, int viewportId, float gridSize);
 
-    /// Wrapper for grid snapping and grid size bus calls.
+    //! Wrapper for grid snapping and grid size bus calls.
     GridSnapParameters GridSnapSettings(int viewportId);
 
-    /// Wrapper for angle snapping enabled bus call.
+    //! Wrapper for angle snapping enabled bus call.
     bool AngleSnapping(int viewportId);
 
-    /// Wrapper for angle snapping increment bus call.
-    /// @return Angle in degrees
+    //! Wrapper for angle snapping increment bus call.
+    //! @return Angle in degrees.
     float AngleStep(int viewportId);
 
-    /// Wrapper for grid rendering check call.
+    //! Wrapper for grid rendering check call.
     bool ShowingGrid(int viewportId);
 
-    /// Render the grid used for snapping.
-    void DrawSnappingGrid(
-        AzFramework::DebugDisplayRequests& debugDisplay, const AZ::Transform& worldFromLocal, float squareSize);
+    //! Render the grid used for snapping.
+    void DrawSnappingGrid(AzFramework::DebugDisplayRequests& debugDisplay, const AZ::Transform& worldFromLocal, float squareSize);
 
-    /// Round to x number of significant digits.
-    /// @param value Number to round.
-    /// @param exponent Precision to use when rounding.
+    //! Round to x number of significant digits.
+    //! @param value Number to round.
+    //! @param exponent Precision to use when rounding.
     inline float Round(const float value, const float exponent)
     {
         const float precision = std::pow(10.0f, exponent);
         return roundf(value * precision) / precision;
     }
 
-    /// Round to 3 significant digits (3 digits common usage).
+    //! Round to 3 significant digits (3 digits common usage).
     inline float Round3(const float value)
     {
         return Round(value, 3.0f);
     }
 
-    /// Util to return sign of floating point number.
-    /// value > 0 return 1.0
-    /// value < 0 return -1.0
-    /// value == 0 return 0.0
+    //! Util to return sign of floating point number.
+    //! value > 0 return 1.0
+    //! value < 0 return -1.0
+    //! value == 0 return 0.0
     inline float Sign(const float value)
     {
         return static_cast<float>((0.0f < value) - (value < 0.0f));
     }
 
-    /// Find the max scale element and return the reciprocal of it.
-    /// Note: The reciprocal will be rounded to three significant digits to eliminate 
-    /// noise in the value returned when dealing with values far from the origin.
+    //! Find the max scale element and return the reciprocal of it.
+    //! Note: The reciprocal will be rounded to three significant digits to eliminate
+    //! noise in the value returned when dealing with values far from the origin.
     inline float ScaleReciprocal(const AZ::Transform& transform)
     {
         return Round3(1.0f / transform.GetUniformScale());
     }
 
-    /// Find the reciprocal of the non-uniform scale.
-    /// Each element will be rounded to three significant digits to eliminate noise
-    /// when dealing with values far from the origin.
+    //! Find the reciprocal of the non-uniform scale.
+    //! Each element will be rounded to three significant digits to eliminate noise
+    //! when dealing with values far from the origin.
     inline AZ::Vector3 NonUniformScaleReciprocal(const AZ::Vector3& nonUniformScale)
     {
         AZ::Vector3 scaleReciprocal = nonUniformScale.GetReciprocal();
-        return AZ::Vector3(
-            Round3(scaleReciprocal.GetX()),
-            Round3(scaleReciprocal.GetY()),
-            Round3(scaleReciprocal.GetZ()));
+        return AZ::Vector3(Round3(scaleReciprocal.GetX()), Round3(scaleReciprocal.GetY()), Round3(scaleReciprocal.GetZ()));
     }
 } // namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorSpace.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorSpace.h
index e26c6b8947..7c1176dd2c 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorSpace.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorSpace.h
@@ -20,7 +20,7 @@ namespace AZ
 
 namespace AzToolsFramework
 {
-    /// Handles location for manipulators which have a global space but no local transformation.
+    //! Handles location for manipulators which have a global space but no local transformation.
     class ManipulatorSpace
     {
     public:
@@ -32,17 +32,16 @@ namespace AzToolsFramework
         const AZ::Vector3& GetNonUniformScale() const;
         void SetNonUniformScale(const AZ::Vector3& nonUniformScale);
 
-        /// Calculates a transform combining the space and local transform, taking non-uniform scale into account.
+        //! Calculates a transform combining the space and local transform, taking non-uniform scale into account.
         AZ::Transform ApplySpace(const AZ::Transform& localTransform) const;
 
     private:
-        AZ::Transform m_space = AZ::Transform::CreateIdentity(); ///< Space the manipulator is in.
-        AZ::Vector3 m_nonUniformScale = AZ::Vector3::CreateOne(); ///< Handles non-uniform scale for the space the manipulator is in.
+        AZ::Transform m_space = AZ::Transform::CreateIdentity(); //!< Space the manipulator is in.
+        AZ::Vector3 m_nonUniformScale = AZ::Vector3::CreateOne(); //!< Handles non-uniform scale for the space the manipulator is in.
     };
 
-    /// Handles location for manipulators which have a global space and a local position, but no local rotation.
-    class ManipulatorSpaceWithLocalPosition
-        : public ManipulatorSpace
+    //! Handles location for manipulators which have a global space and a local position, but no local rotation.
+    class ManipulatorSpaceWithLocalPosition : public ManipulatorSpace
     {
     public:
         AZ_TYPE_INFO(ManipulatorSpaceWithLocalPosition, "{47BE15AF-60A8-436B-8F3F-7DDFB97220E6}")
@@ -52,12 +51,11 @@ namespace AzToolsFramework
         void SetLocalPosition(const AZ::Vector3& localPosition);
 
     private:
-        AZ::Vector3 m_localPosition = AZ::Vector3::CreateZero(); ///< Position in local space.
+        AZ::Vector3 m_localPosition = AZ::Vector3::CreateZero(); //!< Position in local space.
     };
 
-    /// Handles location for manipulators which have a global space and a local transform (position and rotation).
-    class ManipulatorSpaceWithLocalTransform
-        : public ManipulatorSpace
+    //! Handles location for manipulators which have a global space and a local transform (position and rotation).
+    class ManipulatorSpaceWithLocalTransform : public ManipulatorSpace
     {
     public:
         AZ_TYPE_INFO(ManipulatorSpaceWithLocalTransform, "{6D100797-1DD8-45B0-A21C-8893B770C0BC}")
@@ -72,6 +70,6 @@ namespace AzToolsFramework
         void SetLocalOrientation(const AZ::Quaternion& localOrientation);
 
     private:
-        AZ::Transform m_localTransform = AZ::Transform::CreateIdentity(); ///< Local transform.
+        AZ::Transform m_localTransform = AZ::Transform::CreateIdentity(); //!< Local transform.
     };
 } // namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorView.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorView.cpp
index 150e23041d..a4c4a59ee6 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorView.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorView.cpp
@@ -1,26 +1,26 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
 #include "ManipulatorView.h"
 
-#include <AzCore/Component/TransformBus.h>
 #include <AzCore/Component/NonUniformScaleBus.h>
+#include <AzCore/Component/TransformBus.h>
 #include <AzCore/Math/VectorConversions.h>
 #include <AzCore/std/containers/array.h>
 #include <AzFramework/Entity/EntityDebugDisplayBus.h>
-#include <AzToolsFramework/Manipulators/ManipulatorManager.h>
 #include <AzToolsFramework/Manipulators/AngularManipulator.h>
-#include <AzToolsFramework/Manipulators/LinearManipulator.h>
 #include <AzToolsFramework/Manipulators/LineSegmentSelectionManipulator.h>
+#include <AzToolsFramework/Manipulators/LinearManipulator.h>
+#include <AzToolsFramework/Manipulators/ManipulatorManager.h>
 #include <AzToolsFramework/Manipulators/PlanarManipulator.h>
 #include <AzToolsFramework/Manipulators/SplineSelectionManipulator.h>
 #include <AzToolsFramework/Maths/TransformUtils.h>
@@ -33,8 +33,7 @@ namespace AzToolsFramework
     AZ::Transform WorldFromLocalWithUniformScale(const AZ::EntityId entityId)
     {
         AZ::Transform worldFromLocal = AZ::Transform::CreateIdentity();
-        AZ::TransformBus::EventResult(
-            worldFromLocal, entityId, &AZ::TransformBus::Events::GetWorldTM);
+        AZ::TransformBus::EventResult(worldFromLocal, entityId, &AZ::TransformBus::Events::GetWorldTM);
 
         return TransformUniformScale(worldFromLocal);
     }
@@ -56,13 +55,16 @@ namespace AzToolsFramework
         return AzToolsFramework::TransformDirectionNoScaling(m_worldFromLocal, direction);
     }
 
-    /// Take into account the location of the camera and orientate the axis so it faces the camera.
-    /// if we did correct the camera (shouldCorrect is true) then we know the axis facing us it negative.
-    /// we can use this to change the rendering for a flipped axis if we wish.
+    // Take into account the location of the camera and orientate the axis so it faces the camera.
+    // if we did correct the camera (shouldCorrect is true) then we know the axis facing us it negative.
+    // we can use this to change the rendering for a flipped axis if we wish.
     static void CameraCorrectAxis(
-        const AZ::Vector3& axis, AZ::Vector3& correctedAxis, const ManipulatorManagerState& managerState,
+        const AZ::Vector3& axis,
+        AZ::Vector3& correctedAxis,
+        const ManipulatorManagerState& managerState,
         const ViewportInteraction::MouseInteraction& mouseInteraction,
-        const AZ::Transform& worldFromLocal, const AZ::Vector3& localPosition,
+        const AZ::Transform& worldFromLocal,
+        const AZ::Vector3& localPosition,
         const AzFramework::CameraState& cameraState,
         bool* shouldCorrect = nullptr)
     {
@@ -74,9 +76,7 @@ namespace AzToolsFramework
             const bool correcting = ShouldFlipCameraAxis(worldFromLocal, localPosition, axis, cameraState);
 
             // the corrected axis, if no flip was required, output == input
-            correctedAxis = correcting
-                ? -axis
-                : axis;
+            correctedAxis = correcting ? -axis : axis;
 
             // optional out ref to use if we care about the result
             if (shouldCorrect)
@@ -86,10 +86,13 @@ namespace AzToolsFramework
         }
     }
 
-    /// Calculate quad bound in world space.
+    // calculate quad bound in world space.
     static Picking::BoundShapeQuad CalculateQuadBound(
-        const AZ::Vector3& localPosition, const ManipulatorState& manipulatorState,
-        const AZ::Vector3& axis1, const AZ::Vector3& axis2, const float size)
+        const AZ::Vector3& localPosition,
+        const ManipulatorState& manipulatorState,
+        const AZ::Vector3& axis1,
+        const AZ::Vector3& axis2,
+        const float size)
     {
         const AZ::Vector3 worldPosition = manipulatorState.TransformPoint(localPosition);
         const AZ::Vector3 endAxis1World = manipulatorState.TransformDirectionNoScaling(axis1) * size;
@@ -104,8 +107,10 @@ namespace AzToolsFramework
     }
 
     static Picking::BoundShapeQuad CalculateQuadBoundBillboard(
-        const AZ::Vector3& localPosition, const AZ::Transform& worldFromLocal,
-        const float size, const AzFramework::CameraState& cameraState)
+        const AZ::Vector3& localPosition,
+        const AZ::Transform& worldFromLocal,
+        const float size,
+        const AzFramework::CameraState& cameraState)
     {
         const AZ::Vector3 worldPosition = worldFromLocal.TransformPoint(localPosition);
 
@@ -117,10 +122,13 @@ namespace AzToolsFramework
         return quadBound;
     }
 
-    /// Calculate line bound in world space (axis and length).
+    // calculate line bound in world space (axis and length).
     static Picking::BoundShapeLineSegment CalculateLineBound(
-        const AZ::Vector3& localPosition, const AZ::Transform& worldFromLocal,
-        const AZ::Vector3& axis, const float length, const float width)
+        const AZ::Vector3& localPosition,
+        const AZ::Transform& worldFromLocal,
+        const AZ::Vector3& axis,
+        const float length,
+        const float width)
     {
         Picking::BoundShapeLineSegment lineBound;
         lineBound.m_start = worldFromLocal.TransformPoint(localPosition);
@@ -129,7 +137,7 @@ namespace AzToolsFramework
         return lineBound;
     }
 
-    /// Calculate line bound in world space (start and end point).
+    // calculate line bound in world space (start and end point).
     static Picking::BoundShapeLineSegment CalculateLineBound(
         const AZ::Vector3& localStartPosition,
         const AZ::Vector3& localEndPosition,
@@ -143,10 +151,14 @@ namespace AzToolsFramework
         return lineBound;
     }
 
-    /// Calculate cone bound in world space.
+    // calculate cone bound in world space.
     static Picking::BoundShapeCone CalculateConeBound(
-        const AZ::Vector3& localPosition, const AZ::Transform& worldFromLocal,
-        const AZ::Vector3& axis, const AZ::Vector3& offset, const float length, const float radius)
+        const AZ::Vector3& localPosition,
+        const AZ::Transform& worldFromLocal,
+        const AZ::Vector3& axis,
+        const AZ::Vector3& offset,
+        const float length,
+        const float radius)
     {
         Picking::BoundShapeCone coneBound;
         coneBound.m_radius = radius;
@@ -156,10 +168,13 @@ namespace AzToolsFramework
         return coneBound;
     }
 
-    /// Calculate box bound in world space.
+    // calculate box bound in world space.
     static Picking::BoundShapeBox CalculateBoxBound(
-        const AZ::Vector3& localPosition, const AZ::Transform& worldFromLocal,
-        const AZ::Quaternion& orientation, const AZ::Vector3& offset, const AZ::Vector3& halfExtents)
+        const AZ::Vector3& localPosition,
+        const AZ::Transform& worldFromLocal,
+        const AZ::Quaternion& orientation,
+        const AZ::Vector3& offset,
+        const AZ::Vector3& halfExtents)
     {
         Picking::BoundShapeBox boxBound;
         boxBound.m_halfExtents = halfExtents;
@@ -168,10 +183,13 @@ namespace AzToolsFramework
         return boxBound;
     }
 
-    /// Calculate cylinder bound in world space.
+    // calculate cylinder bound in world space.
     static Picking::BoundShapeCylinder CalculateCylinderBound(
-        const AZ::Vector3& localPosition, const AZ::Transform& worldFromLocal,
-        const AZ::Vector3& axis, const float length, const float radius)
+        const AZ::Vector3& localPosition,
+        const AZ::Transform& worldFromLocal,
+        const AZ::Vector3& axis,
+        const float length,
+        const float radius)
     {
         Picking::BoundShapeCylinder boxBound;
         boxBound.m_base = worldFromLocal.TransformPoint(localPosition);
@@ -181,10 +199,9 @@ namespace AzToolsFramework
         return boxBound;
     }
 
-    /// Calculate sphere bound in world space.
+    // calculate sphere bound in world space.
     static Picking::BoundShapeSphere CalculateSphereBound(
-        const AZ::Vector3& localPosition, const ManipulatorState& manipulatorState,
-        const float radius)
+        const AZ::Vector3& localPosition, const ManipulatorState& manipulatorState, const float radius)
     {
         Picking::BoundShapeSphere sphereBound;
         sphereBound.m_center = manipulatorState.TransformPoint(localPosition);
@@ -192,10 +209,13 @@ namespace AzToolsFramework
         return sphereBound;
     }
 
-    /// Calculate torus bound in world space.
+    // calculate torus bound in world space.
     static Picking::BoundShapeTorus CalculateTorusBound(
-        const AZ::Vector3& localPosition, const AZ::Transform& worldFromLocal,
-        const AZ::Vector3& axis, const float radius, const float width)
+        const AZ::Vector3& localPosition,
+        const AZ::Transform& worldFromLocal,
+        const AZ::Vector3& axis,
+        const float radius,
+        const float width)
     {
         Picking::BoundShapeTorus torusBound;
         torusBound.m_center = worldFromLocal.TransformPoint(localPosition);
@@ -205,7 +225,7 @@ namespace AzToolsFramework
         return torusBound;
     }
 
-    /// Calculate spline bound in world space.
+    // calculate spline bound in world space.
     static Picking::BoundShapeSpline CalculateSplineBound(
         const AZStd::weak_ptr<const AZ::Spline>& spline, const AZ::Transform& worldFromLocal, const float width)
     {
@@ -224,8 +244,7 @@ namespace AzToolsFramework
         return lineWidth[mouseOver];
     }
 
-    static AZ::Color ViewColor(
-        const bool mouseOver, const AZ::Color& defaultColor, const AZ::Color& mouseOverColor)
+    static AZ::Color ViewColor(const bool mouseOver, const AZ::Color& defaultColor, const AZ::Color& mouseOverColor)
     {
         const AZStd::array<AZ::Color, 2> viewColor = { { defaultColor, mouseOverColor } };
         return viewColor[mouseOver].GetAsVector4();
@@ -250,19 +269,16 @@ namespace AzToolsFramework
 
     void ManipulatorView::SetBoundDirty(const ManipulatorManagerId managerId)
     {
-        ManipulatorManagerRequestBus::Event(
-            managerId, &ManipulatorManagerRequestBus::Events::SetBoundDirty, m_boundId);
+        ManipulatorManagerRequestBus::Event(managerId, &ManipulatorManagerRequestBus::Events::SetBoundDirty, m_boundId);
 
         m_boundDirty = true;
     }
 
     void ManipulatorView::RefreshBound(
-        const ManipulatorManagerId managerId, const ManipulatorId manipulatorId,
-        const Picking::BoundRequestShapeBase& bound)
+        const ManipulatorManagerId managerId, const ManipulatorId manipulatorId, const Picking::BoundRequestShapeBase& bound)
     {
         ManipulatorManagerRequestBus::EventResult(
-            m_boundId, managerId, &ManipulatorManagerRequestBus::Events::UpdateBound,
-            manipulatorId, m_boundId, bound);
+            m_boundId, managerId, &ManipulatorManagerRequestBus::Events::UpdateBound, manipulatorId, m_boundId, bound);
 
         // store the manager id if we know the bound has been registered
         m_managerId = managerId;
@@ -271,8 +287,7 @@ namespace AzToolsFramework
     }
 
     void ManipulatorView::RefreshBoundInternal(
-        const ManipulatorManagerId managerId, const ManipulatorId manipulatorId,
-        const Picking::BoundRequestShapeBase& bound)
+        const ManipulatorManagerId managerId, const ManipulatorId manipulatorId, const Picking::BoundRequestShapeBase& bound)
     {
         // update the manipulator's bounds if necessary
         // if m_screenSizeFixed is true, any camera movement can potentially change the size
@@ -287,8 +302,7 @@ namespace AzToolsFramework
     {
         if (m_boundId != Picking::InvalidBoundId)
         {
-            ManipulatorManagerRequestBus::Event(
-                managerId, &ManipulatorManagerRequestBus::Events::DeleteManipulatorBound, m_boundId);
+            ManipulatorManagerRequestBus::Event(managerId, &ManipulatorManagerRequestBus::Events::DeleteManipulatorBound, m_boundId);
 
             m_boundId = Picking::InvalidBoundId;
         }
@@ -297,33 +311,34 @@ namespace AzToolsFramework
     float ManipulatorView::ManipulatorViewScaleMultiplier(
         const AZ::Vector3& worldPosition, const AzFramework::CameraState& cameraState) const
     {
-        return ScreenSizeFixed()
-            ? CalculateScreenToWorldMultiplier(worldPosition, cameraState)
-            : 1.0f;
+        return ScreenSizeFixed() ? CalculateScreenToWorldMultiplier(worldPosition, cameraState) : 1.0f;
     }
 
     ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
     void ManipulatorViewQuad::Draw(
-        const ManipulatorManagerId managerId, const ManipulatorManagerState& managerState,
-        const ManipulatorId manipulatorId, const ManipulatorState& manipulatorState,
-        AzFramework::DebugDisplayRequests& debugDisplay, const AzFramework::CameraState& cameraState,
+        const ManipulatorManagerId managerId,
+        const ManipulatorManagerState& managerState,
+        const ManipulatorId manipulatorId,
+        const ManipulatorState& manipulatorState,
+        AzFramework::DebugDisplayRequests& debugDisplay,
+        const AzFramework::CameraState& cameraState,
         const ViewportInteraction::MouseInteraction& mouseInteraction)
     {
         const AZ::Vector3 axis1 = m_axis1;
         const AZ::Vector3 axis2 = m_axis2;
 
         CameraCorrectAxis(
-            axis1, m_cameraCorrectedAxis1, managerState, mouseInteraction,
-            manipulatorState.m_worldFromLocal, manipulatorState.m_localPosition, cameraState);
+            axis1, m_cameraCorrectedAxis1, managerState, mouseInteraction, manipulatorState.m_worldFromLocal,
+            manipulatorState.m_localPosition, cameraState);
         CameraCorrectAxis(
-            axis2, m_cameraCorrectedAxis2, managerState, mouseInteraction,
-            manipulatorState.m_worldFromLocal, manipulatorState.m_localPosition, cameraState);
+            axis2, m_cameraCorrectedAxis2, managerState, mouseInteraction, manipulatorState.m_worldFromLocal,
+            manipulatorState.m_localPosition, cameraState);
 
-        const Picking::BoundShapeQuad quadBound =
-            CalculateQuadBound(
-                manipulatorState.m_localPosition, manipulatorState, m_cameraCorrectedAxis1, m_cameraCorrectedAxis2,
-                m_size * ManipulatorViewScaleMultiplier(
+        const Picking::BoundShapeQuad quadBound = CalculateQuadBound(
+            manipulatorState.m_localPosition, manipulatorState, m_cameraCorrectedAxis1, m_cameraCorrectedAxis2,
+            m_size *
+                ManipulatorViewScaleMultiplier(
                     manipulatorState.m_worldFromLocal.TransformPoint(manipulatorState.m_localPosition), cameraState));
 
         debugDisplay.SetLineWidth(defaultLineWidth(manipulatorState.m_mouseOver));
@@ -339,9 +354,7 @@ namespace AzToolsFramework
             debugDisplay.SetColor(Vector3ToVector4(m_mouseOverColor.GetAsVector3(), 0.5f));
 
             debugDisplay.CullOff();
-            debugDisplay.DrawQuad(
-                quadBound.m_corner1, quadBound.m_corner2,
-                quadBound.m_corner3, quadBound.m_corner4);
+            debugDisplay.DrawQuad(quadBound.m_corner1, quadBound.m_corner2, quadBound.m_corner3, quadBound.m_corner4);
             debugDisplay.CullOn();
         }
 
@@ -349,41 +362,46 @@ namespace AzToolsFramework
     }
 
     void ManipulatorViewQuadBillboard::Draw(
-        const ManipulatorManagerId managerId, const ManipulatorManagerState& /*managerState*/,
-        const ManipulatorId manipulatorId, const ManipulatorState& manipulatorState,
-        AzFramework::DebugDisplayRequests& debugDisplay, const AzFramework::CameraState& cameraState,
+        const ManipulatorManagerId managerId,
+        const ManipulatorManagerState& /*managerState*/,
+        const ManipulatorId manipulatorId,
+        const ManipulatorState& manipulatorState,
+        AzFramework::DebugDisplayRequests& debugDisplay,
+        const AzFramework::CameraState& cameraState,
         const ViewportInteraction::MouseInteraction& /*mouseInteraction*/)
     {
-        const Picking::BoundShapeQuad quadBound =
-            CalculateQuadBoundBillboard(manipulatorState.m_localPosition, manipulatorState.m_worldFromLocal,
-                m_size * ManipulatorViewScaleMultiplier(
-                    manipulatorState.m_worldFromLocal.TransformPoint(manipulatorState.m_localPosition), cameraState), cameraState);
+        const Picking::BoundShapeQuad quadBound = CalculateQuadBoundBillboard(
+            manipulatorState.m_localPosition, manipulatorState.m_worldFromLocal,
+            m_size *
+                ManipulatorViewScaleMultiplier(
+                    manipulatorState.m_worldFromLocal.TransformPoint(manipulatorState.m_localPosition), cameraState),
+            cameraState);
 
         debugDisplay.SetColor(ViewColor(manipulatorState.m_mouseOver, m_color, m_mouseOverColor).GetAsVector4());
-        debugDisplay.DrawQuad(
-            quadBound.m_corner1, quadBound.m_corner2,
-            quadBound.m_corner3, quadBound.m_corner4);
+        debugDisplay.DrawQuad(quadBound.m_corner1, quadBound.m_corner2, quadBound.m_corner3, quadBound.m_corner4);
 
         RefreshBoundInternal(managerId, manipulatorId, quadBound);
     }
 
     void ManipulatorViewLine::Draw(
-        const ManipulatorManagerId managerId, const ManipulatorManagerState& managerState,
-        const ManipulatorId manipulatorId, const ManipulatorState& manipulatorState,
-        AzFramework::DebugDisplayRequests& debugDisplay, const AzFramework::CameraState& cameraState,
+        const ManipulatorManagerId managerId,
+        const ManipulatorManagerState& managerState,
+        const ManipulatorId manipulatorId,
+        const ManipulatorState& manipulatorState,
+        AzFramework::DebugDisplayRequests& debugDisplay,
+        const AzFramework::CameraState& cameraState,
         const ViewportInteraction::MouseInteraction& mouseInteraction)
     {
-        const float viewScale = ManipulatorViewScaleMultiplier(
-            manipulatorState.m_worldFromLocal.TransformPoint(manipulatorState.m_localPosition), cameraState);
+        const float viewScale =
+            ManipulatorViewScaleMultiplier(manipulatorState.m_worldFromLocal.TransformPoint(manipulatorState.m_localPosition), cameraState);
 
         CameraCorrectAxis(
-            m_axis, m_cameraCorrectedAxis, managerState, mouseInteraction,
-            manipulatorState.m_worldFromLocal, manipulatorState.m_localPosition, cameraState);
+            m_axis, m_cameraCorrectedAxis, managerState, mouseInteraction, manipulatorState.m_worldFromLocal,
+            manipulatorState.m_localPosition, cameraState);
 
-        const Picking::BoundShapeLineSegment lineBound =
-            CalculateLineBound(
-                manipulatorState.m_localPosition, manipulatorState.m_worldFromLocal,
-                m_cameraCorrectedAxis, m_length * viewScale, m_width * viewScale);
+        const Picking::BoundShapeLineSegment lineBound = CalculateLineBound(
+            manipulatorState.m_localPosition, manipulatorState.m_worldFromLocal, m_cameraCorrectedAxis, m_length * viewScale,
+            m_width * viewScale);
 
         debugDisplay.SetColor(ViewColor(manipulatorState.m_mouseOver, m_color, m_mouseOverColor).GetAsVector4());
         debugDisplay.SetLineWidth(defaultLineWidth(manipulatorState.m_mouseOver));
@@ -393,13 +411,16 @@ namespace AzToolsFramework
     }
 
     void ManipulatorViewLineSelect::Draw(
-        const ManipulatorManagerId managerId, const ManipulatorManagerState& /*managerState*/,
-        const ManipulatorId manipulatorId, const ManipulatorState& manipulatorState,
-        AzFramework::DebugDisplayRequests& debugDisplay, const AzFramework::CameraState& cameraState,
+        const ManipulatorManagerId managerId,
+        const ManipulatorManagerState& /*managerState*/,
+        const ManipulatorId manipulatorId,
+        const ManipulatorState& manipulatorState,
+        AzFramework::DebugDisplayRequests& debugDisplay,
+        const AzFramework::CameraState& cameraState,
         const ViewportInteraction::MouseInteraction& mouseInteraction)
     {
-        const float viewScale = ManipulatorViewScaleMultiplier(
-            manipulatorState.m_worldFromLocal.TransformPoint(manipulatorState.m_localPosition), cameraState);
+        const float viewScale =
+            ManipulatorViewScaleMultiplier(manipulatorState.m_worldFromLocal.TransformPoint(manipulatorState.m_localPosition), cameraState);
 
         const Picking::BoundShapeLineSegment lineBound =
             CalculateLineBound(m_localStart, m_localEnd, manipulatorState, m_width * viewScale);
@@ -407,44 +428,42 @@ namespace AzToolsFramework
         if (manipulatorState.m_mouseOver)
         {
             const LineSegmentSelectionManipulator::Action action = CalculateManipulationDataAction(
-                manipulatorState.m_worldFromLocal, manipulatorState.m_nonUniformScale,
-                mouseInteraction.m_mousePick.m_rayOrigin, mouseInteraction.m_mousePick.m_rayDirection,
-                cameraState.m_farClip, m_localStart, m_localEnd);
+                manipulatorState.m_worldFromLocal, manipulatorState.m_nonUniformScale, mouseInteraction.m_mousePick.m_rayOrigin,
+                mouseInteraction.m_mousePick.m_rayDirection, cameraState.m_farClip, m_localStart, m_localEnd);
 
             const AZ::Vector3 worldLineHitPosition = manipulatorState.TransformPoint(action.m_localLineHitPosition);
             debugDisplay.SetColor(AZ::Vector4(0.0f, 1.0f, 0.0f, 1.0f));
             debugDisplay.DrawBall(
-                worldLineHitPosition, ManipulatorViewScaleMultiplier(worldLineHitPosition, cameraState)
-                    * g_defaultManipulatorSphereRadius, false);
+                worldLineHitPosition, ManipulatorViewScaleMultiplier(worldLineHitPosition, cameraState) * g_defaultManipulatorSphereRadius,
+                false);
         }
 
         RefreshBoundInternal(managerId, manipulatorId, lineBound);
     }
 
     void ManipulatorViewCone::Draw(
-        const ManipulatorManagerId managerId, const ManipulatorManagerState& managerState,
-        const ManipulatorId manipulatorId, const ManipulatorState& manipulatorState,
-        AzFramework::DebugDisplayRequests& debugDisplay, const AzFramework::CameraState& cameraState,
+        const ManipulatorManagerId managerId,
+        const ManipulatorManagerState& managerState,
+        const ManipulatorId manipulatorId,
+        const ManipulatorState& manipulatorState,
+        AzFramework::DebugDisplayRequests& debugDisplay,
+        const AzFramework::CameraState& cameraState,
         const ViewportInteraction::MouseInteraction& mouseInteraction)
     {
-        const float viewScale = ManipulatorViewScaleMultiplier(
-            manipulatorState.m_worldFromLocal.TransformPoint(manipulatorState.m_localPosition), cameraState);
+        const float viewScale =
+            ManipulatorViewScaleMultiplier(manipulatorState.m_worldFromLocal.TransformPoint(manipulatorState.m_localPosition), cameraState);
 
         CameraCorrectAxis(
-            m_axis, m_cameraCorrectedAxis, managerState, mouseInteraction,
-            manipulatorState.m_worldFromLocal, manipulatorState.m_localPosition,
-            cameraState, &m_shouldCorrect);
+            m_axis, m_cameraCorrectedAxis, managerState, mouseInteraction, manipulatorState.m_worldFromLocal,
+            manipulatorState.m_localPosition, cameraState, &m_shouldCorrect);
 
         CameraCorrectAxis(
-            m_offset, m_cameraCorrectedOffset, managerState, mouseInteraction,
-            manipulatorState.m_worldFromLocal, manipulatorState.m_localPosition, cameraState);
+            m_offset, m_cameraCorrectedOffset, managerState, mouseInteraction, manipulatorState.m_worldFromLocal,
+            manipulatorState.m_localPosition, cameraState);
 
-        const Picking::BoundShapeCone coneBound =
-            CalculateConeBound(
-                manipulatorState.m_localPosition, manipulatorState.m_worldFromLocal, m_cameraCorrectedAxis,
-                m_cameraCorrectedOffset * viewScale,
-                m_length * viewScale,
-                m_radius * viewScale);
+        const Picking::BoundShapeCone coneBound = CalculateConeBound(
+            manipulatorState.m_localPosition, manipulatorState.m_worldFromLocal, m_cameraCorrectedAxis, m_cameraCorrectedOffset * viewScale,
+            m_length * viewScale, m_radius * viewScale);
 
         debugDisplay.SetColor(ViewColor(manipulatorState.m_mouseOver, m_color, m_mouseOverColor).GetAsVector4());
         if (m_shouldCorrect)
@@ -460,73 +479,77 @@ namespace AzToolsFramework
     }
 
     void ManipulatorViewBox::Draw(
-        const ManipulatorManagerId managerId, const ManipulatorManagerState& managerState,
-        const ManipulatorId manipulatorId, const ManipulatorState& manipulatorState,
-        AzFramework::DebugDisplayRequests& debugDisplay, const AzFramework::CameraState& cameraState,
+        const ManipulatorManagerId managerId,
+        const ManipulatorManagerState& managerState,
+        const ManipulatorId manipulatorId,
+        const ManipulatorState& manipulatorState,
+        AzFramework::DebugDisplayRequests& debugDisplay,
+        const AzFramework::CameraState& cameraState,
         const ViewportInteraction::MouseInteraction& mouseInteraction)
     {
-        const float viewScale = ManipulatorViewScaleMultiplier(
-            manipulatorState.m_worldFromLocal.TransformPoint(manipulatorState.m_localPosition), cameraState);
+        const float viewScale =
+            ManipulatorViewScaleMultiplier(manipulatorState.m_worldFromLocal.TransformPoint(manipulatorState.m_localPosition), cameraState);
 
         const AZ::Quaternion orientation = m_orientation;
 
         CameraCorrectAxis(
-            m_offset, m_cameraCorrectedOffset, managerState, mouseInteraction,
-            manipulatorState.m_worldFromLocal, manipulatorState.m_localPosition,
-            cameraState);
+            m_offset, m_cameraCorrectedOffset, managerState, mouseInteraction, manipulatorState.m_worldFromLocal,
+            manipulatorState.m_localPosition, cameraState);
 
-        const Picking::BoundShapeBox boxBound =
-            CalculateBoxBound(manipulatorState.m_localPosition, manipulatorState.m_worldFromLocal, orientation,
-                m_cameraCorrectedOffset * viewScale,
-                m_halfExtents * viewScale);
+        const Picking::BoundShapeBox boxBound = CalculateBoxBound(
+            manipulatorState.m_localPosition, manipulatorState.m_worldFromLocal, orientation, m_cameraCorrectedOffset * viewScale,
+            m_halfExtents * viewScale);
 
         const AZ::Vector3 xAxis = boxBound.m_orientation.TransformVector(AZ::Vector3::CreateAxisX());
         const AZ::Vector3 yAxis = boxBound.m_orientation.TransformVector(AZ::Vector3::CreateAxisY());
         const AZ::Vector3 zAxis = boxBound.m_orientation.TransformVector(AZ::Vector3::CreateAxisZ());
 
         debugDisplay.SetColor(ViewColor(manipulatorState.m_mouseOver, m_color, m_mouseOverColor).GetAsVector4());
-        debugDisplay.DrawSolidOBB(boxBound.m_center,
-            xAxis, yAxis, zAxis, boxBound.m_halfExtents);
+        debugDisplay.DrawSolidOBB(boxBound.m_center, xAxis, yAxis, zAxis, boxBound.m_halfExtents);
 
         RefreshBoundInternal(managerId, manipulatorId, boxBound);
     }
 
     void ManipulatorViewCylinder::Draw(
-        const ManipulatorManagerId managerId, const ManipulatorManagerState& managerState,
-        const ManipulatorId manipulatorId, const ManipulatorState& manipulatorState,
-        AzFramework::DebugDisplayRequests& debugDisplay, const AzFramework::CameraState& cameraState,
+        const ManipulatorManagerId managerId,
+        const ManipulatorManagerState& managerState,
+        const ManipulatorId manipulatorId,
+        const ManipulatorState& manipulatorState,
+        AzFramework::DebugDisplayRequests& debugDisplay,
+        const AzFramework::CameraState& cameraState,
         const ViewportInteraction::MouseInteraction& mouseInteraction)
     {
-        const float viewScale = ManipulatorViewScaleMultiplier(
-            manipulatorState.m_worldFromLocal.TransformPoint(manipulatorState.m_localPosition), cameraState);
+        const float viewScale =
+            ManipulatorViewScaleMultiplier(manipulatorState.m_worldFromLocal.TransformPoint(manipulatorState.m_localPosition), cameraState);
 
         CameraCorrectAxis(
-            m_axis, m_cameraCorrectedAxis, managerState, mouseInteraction,
-            manipulatorState.m_worldFromLocal, manipulatorState.m_localPosition, cameraState);
+            m_axis, m_cameraCorrectedAxis, managerState, mouseInteraction, manipulatorState.m_worldFromLocal,
+            manipulatorState.m_localPosition, cameraState);
 
-        const Picking::BoundShapeCylinder cylinderBound =
-            CalculateCylinderBound(
-                manipulatorState.m_localPosition, manipulatorState.m_worldFromLocal, m_cameraCorrectedAxis,
-                m_length * viewScale,
-                m_radius * viewScale);
+        const Picking::BoundShapeCylinder cylinderBound = CalculateCylinderBound(
+            manipulatorState.m_localPosition, manipulatorState.m_worldFromLocal, m_cameraCorrectedAxis, m_length * viewScale,
+            m_radius * viewScale);
 
         debugDisplay.SetColor(ViewColor(manipulatorState.m_mouseOver, m_color, m_mouseOverColor).GetAsVector4());
-        debugDisplay.DrawSolidCylinder(cylinderBound.m_base + cylinderBound.m_axis * cylinderBound.m_height * 0.5f,
-            cylinderBound.m_axis, cylinderBound.m_radius, cylinderBound.m_height, false);
+        debugDisplay.DrawSolidCylinder(
+            cylinderBound.m_base + cylinderBound.m_axis * cylinderBound.m_height * 0.5f, cylinderBound.m_axis, cylinderBound.m_radius,
+            cylinderBound.m_height, false);
 
         RefreshBoundInternal(managerId, manipulatorId, cylinderBound);
     }
 
     void ManipulatorViewSphere::Draw(
-        const ManipulatorManagerId managerId, const ManipulatorManagerState& /*managerState*/,
-        const ManipulatorId manipulatorId, const ManipulatorState& manipulatorState,
-        AzFramework::DebugDisplayRequests& debugDisplay, const AzFramework::CameraState& cameraState,
+        const ManipulatorManagerId managerId,
+        const ManipulatorManagerState& /*managerState*/,
+        const ManipulatorId manipulatorId,
+        const ManipulatorState& manipulatorState,
+        AzFramework::DebugDisplayRequests& debugDisplay,
+        const AzFramework::CameraState& cameraState,
         const ViewportInteraction::MouseInteraction& mouseInteraction)
     {
-        const Picking::BoundShapeSphere sphereBound =
-            CalculateSphereBound(manipulatorState.m_localPosition, manipulatorState,
-                m_radius * ManipulatorViewScaleMultiplier(
-                    manipulatorState.TransformPoint(manipulatorState.m_localPosition), cameraState));
+        const Picking::BoundShapeSphere sphereBound = CalculateSphereBound(
+            manipulatorState.m_localPosition, manipulatorState,
+            m_radius * ManipulatorViewScaleMultiplier(manipulatorState.TransformPoint(manipulatorState.m_localPosition), cameraState));
 
         if (m_depthTest)
         {
@@ -545,31 +568,32 @@ namespace AzToolsFramework
     }
 
     void ManipulatorViewCircle::Draw(
-        const ManipulatorManagerId managerId, const ManipulatorManagerState& /*managerState*/,
-        const ManipulatorId manipulatorId, const ManipulatorState& manipulatorState,
-        AzFramework::DebugDisplayRequests& debugDisplay, const AzFramework::CameraState& cameraState,
+        const ManipulatorManagerId managerId,
+        const ManipulatorManagerState& /*managerState*/,
+        const ManipulatorId manipulatorId,
+        const ManipulatorState& manipulatorState,
+        AzFramework::DebugDisplayRequests& debugDisplay,
+        const AzFramework::CameraState& cameraState,
         const ViewportInteraction::MouseInteraction& /*mouseInteraction*/)
     {
-        const float viewScale = ManipulatorViewScaleMultiplier(
-            manipulatorState.m_worldFromLocal.TransformPoint(manipulatorState.m_localPosition), cameraState);
+        const float viewScale =
+            ManipulatorViewScaleMultiplier(manipulatorState.m_worldFromLocal.TransformPoint(manipulatorState.m_localPosition), cameraState);
 
-        const Picking::BoundShapeTorus torusBound =
-            CalculateTorusBound(
-                manipulatorState.m_localPosition, manipulatorState.m_worldFromLocal, m_axis,
-                m_radius * viewScale,
-                m_width * viewScale);
+        const Picking::BoundShapeTorus torusBound = CalculateTorusBound(
+            manipulatorState.m_localPosition, manipulatorState.m_worldFromLocal, m_axis, m_radius * viewScale, m_width * viewScale);
 
         // transform circle based on delta between default z up axis and other axes
         const AZ::Transform worldFromLocalWithOrientation =
             AZ::Transform::CreateTranslation(manipulatorState.m_worldFromLocal.GetTranslation()) *
-            AZ::Transform::CreateFromQuaternion(
-                (QuaternionFromTransformNoScaling(manipulatorState.m_worldFromLocal) *
-                AZ::Quaternion::CreateShortestArc(AZ::Vector3::CreateAxisZ(), m_axis)).GetNormalized());
+            AZ::Transform::CreateFromQuaternion((QuaternionFromTransformNoScaling(manipulatorState.m_worldFromLocal) *
+                                                 AZ::Quaternion::CreateShortestArc(AZ::Vector3::CreateAxisZ(), m_axis))
+                                                    .GetNormalized());
 
         debugDisplay.CullOn();
         debugDisplay.PushMatrix(worldFromLocalWithOrientation);
         debugDisplay.SetColor(ViewColor(manipulatorState.m_mouseOver, m_color, m_mouseOverColor).GetAsVector4());
-        m_drawCircleFunc(debugDisplay, manipulatorState.m_localPosition, torusBound.m_majorRadius,
+        m_drawCircleFunc(
+            debugDisplay, manipulatorState.m_localPosition, torusBound.m_majorRadius,
             worldFromLocalWithOrientation.GetInverse().TransformPoint(cameraState.m_position));
         debugDisplay.PopMatrix();
         debugDisplay.CullOff();
@@ -578,27 +602,28 @@ namespace AzToolsFramework
     }
 
     void DrawHalfDottedCircle(
-        AzFramework::DebugDisplayRequests& debugDisplay, const AZ::Vector3& position,
-        const float radius, const AZ::Vector3& viewPos)
+        AzFramework::DebugDisplayRequests& debugDisplay, const AZ::Vector3& position, const float radius, const AZ::Vector3& viewPos)
     {
         debugDisplay.DrawHalfDottedCircle(position, radius, viewPos);
     }
 
     void DrawFullCircle(
-        AzFramework::DebugDisplayRequests& debugDisplay, const AZ::Vector3& position,
-        const float radius, const AZ::Vector3& /*viewPos*/)
+        AzFramework::DebugDisplayRequests& debugDisplay, const AZ::Vector3& position, const float radius, const AZ::Vector3& /*viewPos*/)
     {
-         debugDisplay.DrawCircle(position, radius);
+        debugDisplay.DrawCircle(position, radius);
     }
 
     void ManipulatorViewSplineSelect::Draw(
-        const ManipulatorManagerId managerId, const ManipulatorManagerState& /*managerState*/,
-        const ManipulatorId manipulatorId, const ManipulatorState& manipulatorState,
-        AzFramework::DebugDisplayRequests& debugDisplay, const AzFramework::CameraState& cameraState,
+        const ManipulatorManagerId managerId,
+        const ManipulatorManagerState& /*managerState*/,
+        const ManipulatorId manipulatorId,
+        const ManipulatorState& manipulatorState,
+        AzFramework::DebugDisplayRequests& debugDisplay,
+        const AzFramework::CameraState& cameraState,
         const ViewportInteraction::MouseInteraction& mouseInteraction)
     {
-        const float viewScale = ManipulatorViewScaleMultiplier(
-            manipulatorState.m_worldFromLocal.TransformPoint(manipulatorState.m_localPosition), cameraState);
+        const float viewScale =
+            ManipulatorViewScaleMultiplier(manipulatorState.m_worldFromLocal.TransformPoint(manipulatorState.m_localPosition), cameraState);
 
         const Picking::BoundShapeSpline splineBound =
             CalculateSplineBound(m_spline, manipulatorState.m_worldFromLocal, m_width * viewScale);
@@ -606,16 +631,15 @@ namespace AzToolsFramework
         if (manipulatorState.m_mouseOver)
         {
             const SplineSelectionManipulator::Action action = CalculateManipulationDataAction(
-                manipulatorState.m_worldFromLocal, mouseInteraction.m_mousePick.m_rayOrigin,
-                mouseInteraction.m_mousePick.m_rayDirection, m_spline);
+                manipulatorState.m_worldFromLocal, mouseInteraction.m_mousePick.m_rayOrigin, mouseInteraction.m_mousePick.m_rayDirection,
+                m_spline);
 
-            const AZ::Vector3 worldSplineHitPosition =
-                manipulatorState.m_worldFromLocal.TransformPoint(action.m_localSplineHitPosition);
+            const AZ::Vector3 worldSplineHitPosition = manipulatorState.m_worldFromLocal.TransformPoint(action.m_localSplineHitPosition);
 
             debugDisplay.SetColor(m_color.GetAsVector4());
             debugDisplay.DrawBall(
-                worldSplineHitPosition, ManipulatorViewScaleMultiplier(worldSplineHitPosition, cameraState)
-                    * g_defaultManipulatorSphereRadius, false);
+                worldSplineHitPosition,
+                ManipulatorViewScaleMultiplier(worldSplineHitPosition, cameraState) * g_defaultManipulatorSphereRadius, false);
         }
 
         RefreshBoundInternal(managerId, manipulatorId, splineBound);
@@ -624,8 +648,7 @@ namespace AzToolsFramework
     ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
     AZStd::unique_ptr<ManipulatorViewQuad> CreateManipulatorViewQuad(
-        const PlanarManipulator& planarManipulator, const AZ::Color& axis1Color,
-        const AZ::Color& axis2Color, const float size)
+        const PlanarManipulator& planarManipulator, const AZ::Color& axis1Color, const AZ::Color& axis2Color, const float size)
     {
         AZStd::unique_ptr<ManipulatorViewQuad> viewQuad = AZStd::make_unique<ManipulatorViewQuad>();
         viewQuad->m_axis1 = planarManipulator.GetAxis1();
@@ -636,8 +659,7 @@ namespace AzToolsFramework
         return viewQuad;
     }
 
-    AZStd::unique_ptr<ManipulatorViewQuadBillboard> CreateManipulatorViewQuadBillboard(
-        const AZ::Color& color, const float size)
+    AZStd::unique_ptr<ManipulatorViewQuadBillboard> CreateManipulatorViewQuadBillboard(const AZ::Color& color, const float size)
     {
         AZStd::unique_ptr<ManipulatorViewQuadBillboard> viewQuad = AZStd::make_unique<ManipulatorViewQuadBillboard>();
         viewQuad->m_size = size;
@@ -646,8 +668,7 @@ namespace AzToolsFramework
     }
 
     AZStd::unique_ptr<ManipulatorViewLine> CreateManipulatorViewLine(
-        const LinearManipulator& linearManipulator, const AZ::Color& color,
-        const float length, const float width)
+        const LinearManipulator& linearManipulator, const AZ::Color& color, const float length, const float width)
     {
         AZStd::unique_ptr<ManipulatorViewLine> viewLine = AZStd::make_unique<ManipulatorViewLine>();
         viewLine->m_axis = linearManipulator.GetAxis();
@@ -658,8 +679,7 @@ namespace AzToolsFramework
     }
 
     AZStd::unique_ptr<ManipulatorViewLineSelect> CreateManipulatorViewLineSelect(
-        const LineSegmentSelectionManipulator& lineSegmentManipulator,
-        const AZ::Color& color, const float width)
+        const LineSegmentSelectionManipulator& lineSegmentManipulator, const AZ::Color& color, const float width)
     {
         AZStd::unique_ptr<ManipulatorViewLineSelect> viewLineSelect = AZStd::make_unique<ManipulatorViewLineSelect>();
         viewLineSelect->m_localStart = lineSegmentManipulator.GetStart();
@@ -670,8 +690,11 @@ namespace AzToolsFramework
     }
 
     AZStd::unique_ptr<ManipulatorViewCone> CreateManipulatorViewCone(
-        const LinearManipulator& linearManipulator, const AZ::Color& color,
-        const AZ::Vector3& offset, const float length, const float radius)
+        const LinearManipulator& linearManipulator,
+        const AZ::Color& color,
+        const AZ::Vector3& offset,
+        const float length,
+        const float radius)
     {
         AZStd::unique_ptr<ManipulatorViewCone> viewCone = AZStd::make_unique<ManipulatorViewCone>();
         viewCone->m_axis = linearManipulator.GetAxis();
@@ -683,8 +706,7 @@ namespace AzToolsFramework
     }
 
     AZStd::unique_ptr<ManipulatorViewBox> CreateManipulatorViewBox(
-        const AZ::Transform& transform, const AZ::Color& color,
-        const AZ::Vector3& offset, const AZ::Vector3& halfExtents)
+        const AZ::Transform& transform, const AZ::Color& color, const AZ::Vector3& offset, const AZ::Vector3& halfExtents)
     {
         AZStd::unique_ptr<ManipulatorViewBox> viewBox = AZStd::make_unique<ManipulatorViewBox>();
         viewBox->m_orientation = transform.GetRotation();
@@ -695,8 +717,7 @@ namespace AzToolsFramework
     }
 
     AZStd::unique_ptr<ManipulatorViewCylinder> CreateManipulatorViewCylinder(
-        const LinearManipulator& linearManipulator, const AZ::Color& color,
-        const float length, const float radius)
+        const LinearManipulator& linearManipulator, const AZ::Color& color, const float length, const float radius)
     {
         AZStd::unique_ptr<ManipulatorViewCylinder> viewCylinder = AZStd::make_unique<ManipulatorViewCylinder>();
         viewCylinder->m_axis = linearManipulator.GetAxis();
@@ -718,8 +739,11 @@ namespace AzToolsFramework
     }
 
     AZStd::unique_ptr<ManipulatorViewCircle> CreateManipulatorViewCircle(
-        const AngularManipulator& angularManipulator, const AZ::Color& color,
-        const float radius, const float width, const ManipulatorViewCircle::DrawCircleFunc drawFunc)
+        const AngularManipulator& angularManipulator,
+        const AZ::Color& color,
+        const float radius,
+        const float width,
+        const ManipulatorViewCircle::DrawCircleFunc drawFunc)
     {
         AZStd::unique_ptr<ManipulatorViewCircle> viewCircle = AZStd::make_unique<ManipulatorViewCircle>();
         viewCircle->m_axis = angularManipulator.GetAxis();
@@ -731,8 +755,7 @@ namespace AzToolsFramework
     }
 
     AZStd::unique_ptr<ManipulatorViewSplineSelect> CreateManipulatorViewSplineSelect(
-        const SplineSelectionManipulator& splineManipulator,
-        const AZ::Color& color, const float width)
+        const SplineSelectionManipulator& splineManipulator, const AZ::Color& color, const float width)
     {
         AZStd::unique_ptr<ManipulatorViewSplineSelect> viewSplineSelect = AZStd::make_unique<ManipulatorViewSplineSelect>();
         viewSplineSelect->m_spline = splineManipulator.GetSpline();
@@ -741,16 +764,12 @@ namespace AzToolsFramework
         return viewSplineSelect;
     }
 
-    AZ::Vector3 CalculateViewDirection(
-        const Manipulators& manipulators, const AZ::Vector3& worldViewPosition)
+    AZ::Vector3 CalculateViewDirection(const Manipulators& manipulators, const AZ::Vector3& worldViewPosition)
     {
-        const AZ::Transform worldFromLocalWithTransform =
-            manipulators.GetSpace() * manipulators.GetLocalTransform();
+        const AZ::Transform worldFromLocalWithTransform = manipulators.GetSpace() * manipulators.GetLocalTransform();
 
-        AZ::Vector3 lookDirection =
-            (worldFromLocalWithTransform.GetTranslation() - worldViewPosition).GetNormalized();
+        AZ::Vector3 lookDirection = (worldFromLocalWithTransform.GetTranslation() - worldViewPosition).GetNormalized();
 
-        return TransformDirectionNoScaling(
-            worldFromLocalWithTransform.GetInverse(), lookDirection);
+        return TransformDirectionNoScaling(worldFromLocalWithTransform.GetInverse(), lookDirection);
     }
 } // namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorView.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorView.h
index da426d2340..8573f8ce32 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorView.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorView.h
@@ -1,14 +1,14 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
 #pragma once
 
@@ -26,13 +26,12 @@ namespace AzToolsFramework
     class LineSegmentSelectionManipulator;
     class SplineSelectionManipulator;
 
-    using DecideColorFn = AZStd::function<AZ::Color(
-        const ViewportInteraction::MouseInteraction&,
-        bool mouseOver, const AZ::Color& defaultColor)>;
+    using DecideColorFn =
+        AZStd::function<AZ::Color(const ViewportInteraction::MouseInteraction&, bool mouseOver, const AZ::Color& defaultColor)>;
 
     extern const float g_defaultManipulatorSphereRadius;
 
-    /// State of an individual manipulator.
+    //! State of an individual manipulator.
     struct ManipulatorState
     {
         AZ::Transform m_worldFromLocal;
@@ -40,18 +39,18 @@ namespace AzToolsFramework
         AZ::Vector3 m_localPosition;
         bool m_mouseOver;
 
-        /// Transforms a point, taking non-uniform scale into account.
+        //! Transforms a point, taking non-uniform scale into account.
         AZ::Vector3 TransformPoint(const AZ::Vector3& point) const;
 
-        /// Rotates a direction into the space of the manipulator and normalizes it.
-        /// Non-uniform scaling and translation are not applied.
+        //! Rotates a direction into the space of the manipulator and normalizes it.
+        //! Non-uniform scaling and translation are not applied.
         AZ::Vector3 TransformDirectionNoScaling(const AZ::Vector3& direction) const;
     };
 
-    /// The base interface for the visual representation of manipulators.
-    /// The View represents the appearance and bounds of the manipulator for
-    /// the user to interact with. Any manipulator can have any view (some may
-    /// be more appropriate than others in certain cases).
+    //! The base interface for the visual representation of manipulators.
+    //! The View represents the appearance and bounds of the manipulator for
+    //! the user to interact with. Any manipulator can have any view (some may
+    //! be more appropriate than others in certain cases).
     class ManipulatorView
     {
     public:
@@ -65,98 +64,107 @@ namespace AzToolsFramework
         ManipulatorView& operator=(ManipulatorView&&) = default;
 
         void SetBoundDirty(ManipulatorManagerId managerId);
-        void RefreshBound(
-            ManipulatorManagerId managerId, ManipulatorId manipulatorId, const Picking::BoundRequestShapeBase& bound);
+        void RefreshBound(ManipulatorManagerId managerId, ManipulatorId manipulatorId, const Picking::BoundRequestShapeBase& bound);
         void Invalidate(ManipulatorManagerId managerId);
 
         virtual void Draw(
-            ManipulatorManagerId managerId, const ManipulatorManagerState& managerState,
-            ManipulatorId manipulatorId, const ManipulatorState& manipulatorState,
-            AzFramework::DebugDisplayRequests& debugDisplay, const AzFramework::CameraState& cameraState,
+            ManipulatorManagerId managerId,
+            const ManipulatorManagerState& managerState,
+            ManipulatorId manipulatorId,
+            const ManipulatorState& manipulatorState,
+            AzFramework::DebugDisplayRequests& debugDisplay,
+            const AzFramework::CameraState& cameraState,
             const ViewportInteraction::MouseInteraction& mouseInteraction) = 0;
 
-        bool ScreenSizeFixed() const { return m_screenSizeFixed; }
+        bool ScreenSizeFixed() const
+        {
+            return m_screenSizeFixed;
+        }
 
     protected:
-        AZ::Color m_mouseOverColor = BaseManipulator::s_defaultMouseOverColor; ///< What color should the manipulator
-                                                                               ///< be when the mouse is hovering over it.
-        /// Scale the manipulator based on the distance
-        /// from the camera if m_screenSizeFixed is true.
-        float ManipulatorViewScaleMultiplier(
-            const AZ::Vector3& worldPosition, const AzFramework::CameraState& cameraState) const;
+        AZ::Color m_mouseOverColor = BaseManipulator::s_defaultMouseOverColor; //!< What color should the manipulator
+                                                                               //!< be when the mouse is hovering over it.
+        //! Scale the manipulator based on the distance
+        //! from the camera if m_screenSizeFixed is true.
+        float ManipulatorViewScaleMultiplier(const AZ::Vector3& worldPosition, const AzFramework::CameraState& cameraState) const;
 
-        /// Wrap the logic for updating a bound.
-        /// Should be called at the end of the Draw function once a concrete BoundRequestShape has
-        /// been created to use for dimensions for rendering.
-        void RefreshBoundInternal(
-            ManipulatorManagerId managerId, ManipulatorId manipulatorId, const Picking::BoundRequestShapeBase& bound);
+        //! Wrap the logic for updating a bound.
+        //! Should be called at the end of the Draw function once a concrete BoundRequestShape has
+        //! been created to use for dimensions for rendering.
+        void RefreshBoundInternal(ManipulatorManagerId managerId, ManipulatorId manipulatorId, const Picking::BoundRequestShapeBase& bound);
 
     private:
-        Picking::RegisteredBoundId m_boundId = Picking::InvalidBoundId; ///< Used for hit detection.
-        ManipulatorManagerId m_managerId = InvalidManipulatorManagerId; /// The manipulator manager this view has been registered with.
-        bool m_screenSizeFixed = true; ///< Should manipulator size be adjusted based on camera distance.
-        bool m_boundDirty = true; ///< Do the bounds need to be recalculated.
+        Picking::RegisteredBoundId m_boundId = Picking::InvalidBoundId; //!< Used for hit detection.
+        ManipulatorManagerId m_managerId = InvalidManipulatorManagerId; //! The manipulator manager this view has been registered with.
+        bool m_screenSizeFixed = true; //!< Should manipulator size be adjusted based on camera distance.
+        bool m_boundDirty = true; //!< Do the bounds need to be recalculated.
     };
 
     // A collection of views (a manipulator may have 1 - * views)
     using ManipulatorViews = AZStd::vector<AZStd::shared_ptr<ManipulatorView>>;
 
-    /// Display a quad representing part of a plane, rendered as 4 lines.
-    class ManipulatorViewQuad
-        : public ManipulatorView
+    //! Display a quad representing part of a plane, rendered as 4 lines.
+    class ManipulatorViewQuad : public ManipulatorView
     {
     public:
         AZ_CLASS_ALLOCATOR(ManipulatorViewQuad, AZ::SystemAllocator, 0)
         AZ_RTTI(ManipulatorViewQuad, "{D85E1B45-495E-4755-BCF2-6AE45F8BB2B0}", ManipulatorView)
 
         void Draw(
-            ManipulatorManagerId managerId, const ManipulatorManagerState& managerState,
-            ManipulatorId manipulatorId, const ManipulatorState& manipulatorState,
-            AzFramework::DebugDisplayRequests& debugDisplay, const AzFramework::CameraState& cameraState,
+            ManipulatorManagerId managerId,
+            const ManipulatorManagerState& managerState,
+            ManipulatorId manipulatorId,
+            const ManipulatorState& manipulatorState,
+            AzFramework::DebugDisplayRequests& debugDisplay,
+            const AzFramework::CameraState& cameraState,
             const ViewportInteraction::MouseInteraction& mouseInteraction) override;
 
         AZ::Vector3 m_axis1 = AZ::Vector3(1.0f, 0.0f, 0.0f);
         AZ::Vector3 m_axis2 = AZ::Vector3(0.0f, 1.0f, 0.0f);
         AZ::Color m_axis1Color = AZ::Color(1.0f, 0.0f, 0.0f, 1.0f);
         AZ::Color m_axis2Color = AZ::Color(1.0f, 0.0f, 0.0f, 1.0f);
-        float m_size = 0.06f; ///< size to render and do mouse ray intersection tests against.
+        float m_size = 0.06f; //!< size to render and do mouse ray intersection tests against.
 
     private:
         AZ::Vector3 m_cameraCorrectedAxis1;
         AZ::Vector3 m_cameraCorrectedAxis2;
     };
 
-    /// A screen aligned quad, centered at the position of the manipulator, display filled.
-    class ManipulatorViewQuadBillboard
-        : public ManipulatorView
+    //! A screen aligned quad, centered at the position of the manipulator, display filled.
+    class ManipulatorViewQuadBillboard : public ManipulatorView
     {
     public:
         AZ_CLASS_ALLOCATOR(ManipulatorViewQuadBillboard, AZ::SystemAllocator, 0)
         AZ_RTTI(ManipulatorViewQuadBillboard, "{C205E967-E8C6-4A73-A31B-41EE5529B15B}", ManipulatorView)
 
         void Draw(
-            ManipulatorManagerId managerId, const ManipulatorManagerState& managerState,
-            ManipulatorId manipulatorId, const ManipulatorState& manipulatorState,
-            AzFramework::DebugDisplayRequests& debugDisplay, const AzFramework::CameraState& cameraState,
+            ManipulatorManagerId managerId,
+            const ManipulatorManagerState& managerState,
+            ManipulatorId manipulatorId,
+            const ManipulatorState& manipulatorState,
+            AzFramework::DebugDisplayRequests& debugDisplay,
+            const AzFramework::CameraState& cameraState,
             const ViewportInteraction::MouseInteraction& mouseInteraction) override;
 
         AZ::Color m_color = AZ::Color(1.0f, 0.0f, 0.0f, 1.0f);
-        float m_size = 0.005f; ///< size to render and do mouse ray intersection tests against.
+        float m_size = 0.005f; //!< size to render and do mouse ray intersection tests against.
     };
 
-    /// Displays a debug style line starting from the manipulator's transform,
-    /// width determines the click area.
-    class ManipulatorViewLine
-        : public ManipulatorView
+    //! Displays a debug style line starting from the manipulator's transform,
+    //! width determines the click area.
+    class ManipulatorViewLine : public ManipulatorView
     {
     public:
         AZ_CLASS_ALLOCATOR(ManipulatorViewLine, AZ::SystemAllocator, 0)
         AZ_RTTI(ManipulatorViewLine, "{831EEF66-4A5C-450C-B152-EA4A0BC8A272}", ManipulatorView)
 
         void Draw(
-            ManipulatorManagerId managerId, const ManipulatorManagerState& managerState,
-            ManipulatorId manipulatorId, const ManipulatorState& manipulatorState,
-            AzFramework::DebugDisplayRequests& debugDisplay, const AzFramework::CameraState& cameraState,
+            ManipulatorManagerId managerId,
+            const ManipulatorManagerState& managerState,
+            ManipulatorId manipulatorId,
+            const ManipulatorState& manipulatorState,
+            AzFramework::DebugDisplayRequests& debugDisplay,
+            const AzFramework::CameraState& cameraState,
             const ViewportInteraction::MouseInteraction& mouseInteraction) override;
 
         AZ::Vector3 m_axis;
@@ -168,19 +176,21 @@ namespace AzToolsFramework
         AZ::Vector3 m_cameraCorrectedAxis;
     };
 
-    /// Variant of ManipulatorViewLine which instead of using an axis, provides begin and end
-    /// points for the line. Used for selection when inserting points along a line.
-    class ManipulatorViewLineSelect
-        : public ManipulatorView
+    //! Variant of ManipulatorViewLine which instead of using an axis, provides begin and end
+    //! points for the line. Used for selection when inserting points along a line.
+    class ManipulatorViewLineSelect : public ManipulatorView
     {
     public:
         AZ_CLASS_ALLOCATOR(ManipulatorViewLineSelect, AZ::SystemAllocator, 0)
         AZ_RTTI(ManipulatorViewLineSelect, "{BF26A947-91F8-4595-9A5B-481876EB2C48}", ManipulatorView)
 
         void Draw(
-            ManipulatorManagerId managerId, const ManipulatorManagerState& managerState,
-            ManipulatorId manipulatorId, const ManipulatorState& manipulatorState,
-            AzFramework::DebugDisplayRequests& debugDisplay, const AzFramework::CameraState& cameraState,
+            ManipulatorManagerId managerId,
+            const ManipulatorManagerState& managerState,
+            ManipulatorId manipulatorId,
+            const ManipulatorState& manipulatorState,
+            AzFramework::DebugDisplayRequests& debugDisplay,
+            const AzFramework::CameraState& cameraState,
             const ViewportInteraction::MouseInteraction& mouseInteraction) override;
 
         AZ::Vector3 m_localStart;
@@ -189,20 +199,22 @@ namespace AzToolsFramework
         float m_width = 0.0f;
     };
 
-    /// Displays a filled cone along the specified axis, offset is local translation from
-    /// the manipulator transform (often used in conjunction with other views to build
-    /// aggregate views such as arrows - e.g. a line and cone).
-    class ManipulatorViewCone
-        : public ManipulatorView
+    //! Displays a filled cone along the specified axis, offset is local translation from
+    //! the manipulator transform (often used in conjunction with other views to build
+    //! aggregate views such as arrows - e.g. a line and cone).
+    class ManipulatorViewCone : public ManipulatorView
     {
     public:
         AZ_CLASS_ALLOCATOR(ManipulatorViewCone, AZ::SystemAllocator, 0)
         AZ_RTTI(ManipulatorViewCone, "{BF042887-1F51-4FD8-8CA5-4A649B4AF356}", ManipulatorView)
 
         void Draw(
-            ManipulatorManagerId managerId, const ManipulatorManagerState& managerState,
-            ManipulatorId manipulatorId, const ManipulatorState& manipulatorState,
-            AzFramework::DebugDisplayRequests& debugDisplay, const AzFramework::CameraState& cameraState,
+            ManipulatorManagerId managerId,
+            const ManipulatorManagerState& managerState,
+            ManipulatorId manipulatorId,
+            const ManipulatorState& manipulatorState,
+            AzFramework::DebugDisplayRequests& debugDisplay,
+            const AzFramework::CameraState& cameraState,
             const ViewportInteraction::MouseInteraction& mouseInteraction) override;
 
         AZ::Vector3 m_offset;
@@ -217,20 +229,22 @@ namespace AzToolsFramework
         bool m_shouldCorrect = false;
     };
 
-    /// Displays a filled box, offset is local translation from the manipulator
-    /// transform, box is often used in conjunction with other views, orientation allows
-    /// the box to be orientated separately from the manipulator transform.
-    class ManipulatorViewBox
-        : public ManipulatorView
+    //! Displays a filled box, offset is local translation from the manipulator
+    //! transform, box is often used in conjunction with other views, orientation allows
+    //! the box to be orientated separately from the manipulator transform.
+    class ManipulatorViewBox : public ManipulatorView
     {
     public:
         AZ_CLASS_ALLOCATOR(ManipulatorViewBox, AZ::SystemAllocator, 0)
         AZ_RTTI(ManipulatorViewBox, "{2D082201-7878-4C1B-A3DD-7A629E5AD598}", ManipulatorView)
 
         void Draw(
-            ManipulatorManagerId managerId, const ManipulatorManagerState& managerState,
-            ManipulatorId manipulatorId, const ManipulatorState& manipulatorState,
-            AzFramework::DebugDisplayRequests& debugDisplay, const AzFramework::CameraState& cameraState,
+            ManipulatorManagerId managerId,
+            const ManipulatorManagerState& managerState,
+            ManipulatorId manipulatorId,
+            const ManipulatorState& manipulatorState,
+            AzFramework::DebugDisplayRequests& debugDisplay,
+            const AzFramework::CameraState& cameraState,
             const ViewportInteraction::MouseInteraction& mouseInteraction) override;
 
         AZ::Vector3 m_offset;
@@ -242,18 +256,20 @@ namespace AzToolsFramework
         AZ::Vector3 m_cameraCorrectedOffset;
     };
 
-    /// Displays a filled cylinder along the axis provided.
-    class ManipulatorViewCylinder
-        : public ManipulatorView
+    //! Displays a filled cylinder along the axis provided.
+    class ManipulatorViewCylinder : public ManipulatorView
     {
     public:
         AZ_CLASS_ALLOCATOR(ManipulatorViewCylinder, AZ::SystemAllocator, 0)
         AZ_RTTI(ManipulatorViewCylinder, "{9B8E5EF4-0F85-4CD0-A5FF-3C7097DF58AC}", ManipulatorView)
 
         void Draw(
-            ManipulatorManagerId managerId, const ManipulatorManagerState& managerState,
-            ManipulatorId manipulatorId, const ManipulatorState& manipulatorState,
-            AzFramework::DebugDisplayRequests& debugDisplay, const AzFramework::CameraState& cameraState,
+            ManipulatorManagerId managerId,
+            const ManipulatorManagerState& managerState,
+            ManipulatorId manipulatorId,
+            const ManipulatorState& manipulatorState,
+            AzFramework::DebugDisplayRequests& debugDisplay,
+            const AzFramework::CameraState& cameraState,
             const ViewportInteraction::MouseInteraction& mouseInteraction) override;
 
         AZ::Vector3 m_axis;
@@ -265,20 +281,22 @@ namespace AzToolsFramework
         AZ::Vector3 m_cameraCorrectedAxis;
     };
 
-    /// Displays a filled sphere at the transform of the manipulator, often used as
-    /// a selection manipulator. DecideColorFn allows more complex logic to be used
-    /// to decide the color of the manipulator (based on hover state etc.)
-    class ManipulatorViewSphere
-        : public ManipulatorView
+    //! Displays a filled sphere at the transform of the manipulator, often used as
+    //! a selection manipulator. DecideColorFn allows more complex logic to be used
+    //! to decide the color of the manipulator (based on hover state etc.)
+    class ManipulatorViewSphere : public ManipulatorView
     {
     public:
         AZ_CLASS_ALLOCATOR(ManipulatorViewSphere, AZ::SystemAllocator, 0)
         AZ_RTTI(ManipulatorViewSphere, "{324D8329-6E7B-4A5D-AC8A-8C0E1C984E38}", ManipulatorView)
 
         void Draw(
-            ManipulatorManagerId managerId, const ManipulatorManagerState& managerState,
-            ManipulatorId manipulatorId, const ManipulatorState& manipulatorState,
-            AzFramework::DebugDisplayRequests& debugDisplay, const AzFramework::CameraState& cameraState,
+            ManipulatorManagerId managerId,
+            const ManipulatorManagerState& managerState,
+            ManipulatorId manipulatorId,
+            const ManipulatorState& manipulatorState,
+            AzFramework::DebugDisplayRequests& debugDisplay,
+            const AzFramework::CameraState& cameraState,
             const ViewportInteraction::MouseInteraction& mouseInteraction) override;
 
         float m_radius = 0.0f;
@@ -287,23 +305,24 @@ namespace AzToolsFramework
         bool m_depthTest = false;
     };
 
-    /// Displays a wire circle. DrawCircleFunc can be used to either draw a full
-    /// circle or a half dotted circle where the part of the circle facing away
-    /// from the camera is dotted (useful for angular/rotation manipulators).
-    class ManipulatorViewCircle
-        : public ManipulatorView
+    //! Displays a wire circle. DrawCircleFunc can be used to either draw a full
+    //! circle or a half dotted circle where the part of the circle facing away
+    //! from the camera is dotted (useful for angular/rotation manipulators).
+    class ManipulatorViewCircle : public ManipulatorView
     {
     public:
         AZ_CLASS_ALLOCATOR(ManipulatorViewCircle, AZ::SystemAllocator, 0)
         AZ_RTTI(ManipulatorViewCircle, "{26563A03-3E48-49EB-9DCF-30EE4F567FCD}", ManipulatorView)
 
-        using DrawCircleFunc =
-            void(*)(AzFramework::DebugDisplayRequests&, const AZ::Vector3&, float, const AZ::Vector3&);
+        using DrawCircleFunc = void (*)(AzFramework::DebugDisplayRequests&, const AZ::Vector3&, float, const AZ::Vector3&);
 
         void Draw(
-            ManipulatorManagerId managerId, const ManipulatorManagerState& managerState,
-            ManipulatorId manipulatorId, const ManipulatorState& manipulatorState,
-            AzFramework::DebugDisplayRequests& debugDisplay, const AzFramework::CameraState& cameraState,
+            ManipulatorManagerId managerId,
+            const ManipulatorManagerState& managerState,
+            ManipulatorId manipulatorId,
+            const ManipulatorState& manipulatorState,
+            AzFramework::DebugDisplayRequests& debugDisplay,
+            const AzFramework::CameraState& cameraState,
             const ViewportInteraction::MouseInteraction& mouseInteraction) override;
 
         AZ::Vector3 m_axis;
@@ -316,26 +335,26 @@ namespace AzToolsFramework
     // helpers to provide consistent function pointer interface for deciding
     // on type of circle to draw (see DrawCircleFunc in ManipulatorViewCircle above)
     void DrawHalfDottedCircle(
-        AzFramework::DebugDisplayRequests& debugDisplay, const AZ::Vector3& position,
-        float radius, const AZ::Vector3& viewPos);
+        AzFramework::DebugDisplayRequests& debugDisplay, const AZ::Vector3& position, float radius, const AZ::Vector3& viewPos);
     void DrawFullCircle(
-        AzFramework::DebugDisplayRequests& debugDisplay, const AZ::Vector3& position,
-        float radius, const AZ::Vector3& viewPos);
+        AzFramework::DebugDisplayRequests& debugDisplay, const AZ::Vector3& position, float radius, const AZ::Vector3& viewPos);
 
-    /// Used for interaction with spline primitive - it will generate a spline bound
-    /// to be interacted with and will display the intersection point on the spline
-    /// where a user may wish to insert a point.
-    class ManipulatorViewSplineSelect
-        : public ManipulatorView
+    //! Used for interaction with spline primitive - it will generate a spline bound
+    //! to be interacted with and will display the intersection point on the spline
+    //! where a user may wish to insert a point.
+    class ManipulatorViewSplineSelect : public ManipulatorView
     {
     public:
         AZ_CLASS_ALLOCATOR(ManipulatorViewSplineSelect, AZ::SystemAllocator, 0)
         AZ_RTTI(ManipulatorViewSplineSelect, "{60996E49-D6BF-4817-BAA3-D27A407DD21A}", ManipulatorView)
 
         void Draw(
-            ManipulatorManagerId managerId, const ManipulatorManagerState& managerState,
-            ManipulatorId manipulatorId, const ManipulatorState& manipulatorState,
-            AzFramework::DebugDisplayRequests& debugDisplay, const AzFramework::CameraState& cameraState,
+            ManipulatorManagerId managerId,
+            const ManipulatorManagerState& managerState,
+            ManipulatorId manipulatorId,
+            const ManipulatorState& manipulatorState,
+            AzFramework::DebugDisplayRequests& debugDisplay,
+            const AzFramework::CameraState& cameraState,
             const ViewportInteraction::MouseInteraction& mouseInteraction) override;
 
         AZStd::weak_ptr<const AZ::Spline> m_spline;
@@ -343,65 +362,61 @@ namespace AzToolsFramework
         AZ::Color m_color = AZ::Color(0.0f, 1.0f, 0.0f, 1.0f);
     };
 
-    /// Returns true if axis is pointing away from us (we should flip it).
+    //! Returns true if axis is pointing away from us (we should flip it).
     inline bool ShouldFlipCameraAxis(
-        const AZ::Transform& worldFromLocal, const AZ::Vector3& localPosition,
-        const AZ::Vector3& axis, const AzFramework::CameraState& cameraState)
+        const AZ::Transform& worldFromLocal,
+        const AZ::Vector3& localPosition,
+        const AZ::Vector3& axis,
+        const AzFramework::CameraState& cameraState)
     {
-        return (worldFromLocal.TransformPoint(localPosition) - cameraState.m_position).Dot(
-                TransformDirectionNoScaling(worldFromLocal, axis)) > 0.0f;
+        return (worldFromLocal.TransformPoint(localPosition) - cameraState.m_position)
+                   .Dot(TransformDirectionNoScaling(worldFromLocal, axis)) > 0.0f;
     }
 
-    /// @brief Return the world transform of the entity with uniform scale - choose
-    /// the largest element.
+    //! @brief Return the world transform of the entity with uniform scale - choose
+    //! the largest element.
     AZ::Transform WorldFromLocalWithUniformScale(AZ::EntityId entityId);
 
-    /// Get the non-uniform scale for this entity id.
+    //! Get the non-uniform scale for this entity id.
     AZ::Vector3 GetNonUniformScale(AZ::EntityId entityId);
 
     // Helpers to create various manipulator views.
 
     AZStd::unique_ptr<ManipulatorViewQuad> CreateManipulatorViewQuad(
-        const PlanarManipulator& planarManipulator, const AZ::Color& axis1Color,
-        const AZ::Color& axis2Color, float size);
+        const PlanarManipulator& planarManipulator, const AZ::Color& axis1Color, const AZ::Color& axis2Color, float size);
 
-    AZStd::unique_ptr<ManipulatorViewQuadBillboard> CreateManipulatorViewQuadBillboard(
-        const AZ::Color& color, float size);
+    AZStd::unique_ptr<ManipulatorViewQuadBillboard> CreateManipulatorViewQuadBillboard(const AZ::Color& color, float size);
 
     AZStd::unique_ptr<ManipulatorViewLine> CreateManipulatorViewLine(
-        const LinearManipulator& linearManipulator, const AZ::Color& color,
-        float length, float width);
+        const LinearManipulator& linearManipulator, const AZ::Color& color, float length, float width);
 
     AZStd::unique_ptr<ManipulatorViewLineSelect> CreateManipulatorViewLineSelect(
-        const LineSegmentSelectionManipulator& lineSegmentManipulator, const AZ::Color& color,
-        float width);
+        const LineSegmentSelectionManipulator& lineSegmentManipulator, const AZ::Color& color, float width);
 
     AZStd::unique_ptr<ManipulatorViewCone> CreateManipulatorViewCone(
-        const LinearManipulator& linearManipulator, const AZ::Color& color,
-        const AZ::Vector3& offset, float length, float radius);
+        const LinearManipulator& linearManipulator, const AZ::Color& color, const AZ::Vector3& offset, float length, float radius);
 
     AZStd::unique_ptr<ManipulatorViewBox> CreateManipulatorViewBox(
-        const AZ::Transform& transform, const AZ::Color& color,
-        const AZ::Vector3& offset, const AZ::Vector3& halfExtents);
+        const AZ::Transform& transform, const AZ::Color& color, const AZ::Vector3& offset, const AZ::Vector3& halfExtents);
 
     AZStd::unique_ptr<ManipulatorViewCylinder> CreateManipulatorViewCylinder(
-        const LinearManipulator& linearManipulator, const AZ::Color& color,
-        float length, float radius);
+        const LinearManipulator& linearManipulator, const AZ::Color& color, float length, float radius);
 
     AZStd::unique_ptr<ManipulatorViewSphere> CreateManipulatorViewSphere(
         const AZ::Color& color, float radius, const DecideColorFn& decideColor, bool enableDepthTest = false);
 
     AZStd::unique_ptr<ManipulatorViewCircle> CreateManipulatorViewCircle(
-        const AngularManipulator& angularManipulator, const AZ::Color& color,
-        float radius, float width, ManipulatorViewCircle::DrawCircleFunc drawFunc);
+        const AngularManipulator& angularManipulator,
+        const AZ::Color& color,
+        float radius,
+        float width,
+        ManipulatorViewCircle::DrawCircleFunc drawFunc);
 
     AZStd::unique_ptr<ManipulatorViewSplineSelect> CreateManipulatorViewSplineSelect(
-        const SplineSelectionManipulator& splineManipulator, const AZ::Color& color,
-        float width);
+        const SplineSelectionManipulator& splineManipulator, const AZ::Color& color, float width);
 
-    /// Returns the vector between the view (camera) and the manipulator in the space
-    /// of the Manipulator (manipulator space + local transform).
-    AZ::Vector3 CalculateViewDirection(
-        const Manipulators& manipulators, const AZ::Vector3& worldViewPosition);
+    //! Returns the vector between the view (camera) and the manipulator in the space
+    //! of the Manipulator (manipulator space + local transform).
+    AZ::Vector3 CalculateViewDirection(const Manipulators& manipulators, const AZ::Vector3& worldViewPosition);
 
 } // namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/MultiLinearManipulator.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/MultiLinearManipulator.cpp
index 83c4c28e9a..922ac95bf7 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/MultiLinearManipulator.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/MultiLinearManipulator.cpp
@@ -1,14 +1,14 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
 #include "MultiLinearManipulator.h"
 
@@ -56,10 +56,13 @@ namespace AzToolsFramework
     }
 
     static MultiLinearManipulator::Action BuildMultiLinearManipulatorAction(
-        const AZ::Transform& worldFromLocal, const AZ::Vector3& nonUniformScale, const AZ::Transform& localTransform,
+        const AZ::Transform& worldFromLocal,
+        const AZ::Vector3& nonUniformScale,
+        const AZ::Transform& localTransform,
         const ViewportInteraction::MouseInteraction& interaction,
         const AZStd::vector<LinearManipulator::Fixed>& fixedAxes,
-        const AZStd::vector<LinearManipulator::Starter>& starterStates, const GridSnapParameters& gridSnapParams)
+        const AZStd::vector<LinearManipulator::Starter>& starterStates,
+        const GridSnapParameters& gridSnapParams)
     {
         MultiLinearManipulator::Action action;
         action.m_viewportId = interaction.m_interactionId.m_viewportId;
@@ -96,8 +99,8 @@ namespace AzToolsFramework
             const GridSnapParameters gridSnapParams = GridSnapSettings(interaction.m_interactionId.m_viewportId);
             // pass action containing all linear actions for each axis to handler
             m_onLeftMouseDownCallback(BuildMultiLinearManipulatorAction(
-                worldFromLocalUniformScale, GetNonUniformScale(), GetLocalTransform(),
-                interaction, m_fixedAxes, m_starters, gridSnapParams));
+                worldFromLocalUniformScale, GetNonUniformScale(), GetLocalTransform(), interaction, m_fixedAxes, m_starters,
+                gridSnapParams));
         }
     }
 
@@ -108,8 +111,8 @@ namespace AzToolsFramework
             const AZ::Transform worldFromLocalUniformScale = TransformUniformScale(GetSpace());
             const GridSnapParameters gridSnapParams = GridSnapSettings(interaction.m_interactionId.m_viewportId);
             m_onMouseMoveCallback(BuildMultiLinearManipulatorAction(
-                worldFromLocalUniformScale, GetNonUniformScale(), GetLocalTransform(),
-                interaction, m_fixedAxes, m_starters, gridSnapParams));
+                worldFromLocalUniformScale, GetNonUniformScale(), GetLocalTransform(), interaction, m_fixedAxes, m_starters,
+                gridSnapParams));
         }
     }
 
@@ -120,8 +123,8 @@ namespace AzToolsFramework
             const AZ::Transform worldFromLocalUniformScale = TransformUniformScale(GetSpace());
             const GridSnapParameters gridSnapParams = GridSnapSettings(interaction.m_interactionId.m_viewportId);
             m_onLeftMouseUpCallback(BuildMultiLinearManipulatorAction(
-                worldFromLocalUniformScale, GetNonUniformScale(), GetLocalTransform(),
-                interaction, m_fixedAxes, m_starters, gridSnapParams));
+                worldFromLocalUniformScale, GetNonUniformScale(), GetLocalTransform(), interaction, m_fixedAxes, m_starters,
+                gridSnapParams));
 
             m_starters.clear();
         }
@@ -138,36 +141,31 @@ namespace AzToolsFramework
             const AZ::Transform combined = TransformUniformScale(GetSpace()) * GetLocalTransform();
             for (const auto& fixed : m_fixedAxes)
             {
-                DrawAxis(
-                    debugDisplay, combined.GetTranslation(), TransformDirectionNoScaling(combined, fixed.m_axis));
+                DrawAxis(debugDisplay, combined.GetTranslation(), TransformDirectionNoScaling(combined, fixed.m_axis));
             }
         }
 
         for (auto& view : m_manipulatorViews)
         {
             view->Draw(
-                GetManipulatorManagerId(), managerState,
-                GetManipulatorId(), {
-                    ApplySpace(GetLocalTransform()), GetNonUniformScale(),
-                    AZ::Vector3::CreateZero(), MouseOver()
-                },
-                debugDisplay, cameraState, mouseInteraction);
+                GetManipulatorManagerId(), managerState, GetManipulatorId(),
+                { ApplySpace(GetLocalTransform()), GetNonUniformScale(), AZ::Vector3::CreateZero(), MouseOver() }, debugDisplay,
+                cameraState, mouseInteraction);
         }
     }
 
     void MultiLinearManipulator::AddAxis(const AZ::Vector3& axis)
     {
-        m_fixedAxes.push_back(LinearManipulator::Fixed{axis});
+        m_fixedAxes.push_back(LinearManipulator::Fixed{ axis });
     }
 
     void MultiLinearManipulator::AddAxes(const AZStd::vector<AZ::Vector3>& axes)
     {
         AZStd::transform(
-            axes.begin(), axes.end(),
-            AZStd::back_inserter(m_fixedAxes),
+            axes.begin(), axes.end(), AZStd::back_inserter(m_fixedAxes),
             [](const AZ::Vector3& axis)
             {
-                return LinearManipulator::Fixed{axis};
+                return LinearManipulator::Fixed{ axis };
             });
     }
 
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/MultiLinearManipulator.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/MultiLinearManipulator.h
index 8e31e02605..7cae803dfa 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/MultiLinearManipulator.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/MultiLinearManipulator.h
@@ -1,14 +1,14 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
 #pragma once
 
@@ -80,12 +80,9 @@ namespace AzToolsFramework
         }
 
     private:
-        void OnLeftMouseDownImpl(
-            const ViewportInteraction::MouseInteraction& interaction, float rayIntersectionDistance) override;
-        void OnLeftMouseUpImpl(
-            const ViewportInteraction::MouseInteraction& interaction) override;
-        void OnMouseMoveImpl(
-            const ViewportInteraction::MouseInteraction& interaction) override;
+        void OnLeftMouseDownImpl(const ViewportInteraction::MouseInteraction& interaction, float rayIntersectionDistance) override;
+        void OnLeftMouseUpImpl(const ViewportInteraction::MouseInteraction& interaction) override;
+        void OnMouseMoveImpl(const ViewportInteraction::MouseInteraction& interaction) override;
 
         void InvalidateImpl() override;
         void SetBoundsDirtyImpl() override;
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/PlanarManipulator.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/PlanarManipulator.cpp
index 6eb96f081c..f146ca4430 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/PlanarManipulator.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/PlanarManipulator.cpp
@@ -1,14 +1,14 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
 #include "PlanarManipulator.h"
 
@@ -22,12 +22,15 @@
 namespace AzToolsFramework
 {
     PlanarManipulator::StartInternal PlanarManipulator::CalculateManipulationDataStart(
-        const Fixed& fixed, const AZ::Transform& worldFromLocal, const AZ::Vector3& nonUniformScale, const AZ::Transform& localTransform,
-        const ViewportInteraction::MouseInteraction& interaction, const float intersectionDistance)
+        const Fixed& fixed,
+        const AZ::Transform& worldFromLocal,
+        const AZ::Vector3& nonUniformScale,
+        const AZ::Transform& localTransform,
+        const ViewportInteraction::MouseInteraction& interaction,
+        const float intersectionDistance)
     {
-        const ManipulatorInteraction manipulatorInteraction =
-            BuildManipulatorInteraction(
-                worldFromLocal, nonUniformScale, interaction.m_mousePick.m_rayOrigin, interaction.m_mousePick.m_rayDirection);
+        const ManipulatorInteraction manipulatorInteraction = BuildManipulatorInteraction(
+            worldFromLocal, nonUniformScale, interaction.m_mousePick.m_rayOrigin, interaction.m_mousePick.m_rayDirection);
 
         const AZ::Vector3 normal = TransformDirectionNoScaling(localTransform, fixed.m_normal);
 
@@ -37,8 +40,8 @@ namespace AzToolsFramework
 
         StartInternal startInternal;
         Internal::CalculateRayPlaneIntersectingPoint(
-            manipulatorInteraction.m_localRayOrigin, manipulatorInteraction.m_localRayDirection,
-            localIntersectionPoint, normal, startInternal.m_localHitPosition);
+            manipulatorInteraction.m_localRayOrigin, manipulatorInteraction.m_localRayDirection, localIntersectionPoint, normal,
+            startInternal.m_localHitPosition);
 
         startInternal.m_localPosition = localTransform.GetTranslation();
 
@@ -46,13 +49,16 @@ namespace AzToolsFramework
     }
 
     PlanarManipulator::Action PlanarManipulator::CalculateManipulationDataAction(
-        const Fixed& fixed, const StartInternal& startInternal, const AZ::Transform& worldFromLocal, const AZ::Vector3& nonUniformScale,
-        const AZ::Transform& localTransform, const GridSnapParameters& gridSnapParams,
+        const Fixed& fixed,
+        const StartInternal& startInternal,
+        const AZ::Transform& worldFromLocal,
+        const AZ::Vector3& nonUniformScale,
+        const AZ::Transform& localTransform,
+        const GridSnapParameters& gridSnapParams,
         const ViewportInteraction::MouseInteraction& interaction)
     {
-        const ManipulatorInteraction manipulatorInteraction =
-            BuildManipulatorInteraction(
-                worldFromLocal, nonUniformScale, interaction.m_mousePick.m_rayOrigin, interaction.m_mousePick.m_rayDirection);
+        const ManipulatorInteraction manipulatorInteraction = BuildManipulatorInteraction(
+            worldFromLocal, nonUniformScale, interaction.m_mousePick.m_rayOrigin, interaction.m_mousePick.m_rayDirection);
 
         const AZ::Vector3 normal = TransformDirectionNoScaling(localTransform, fixed.m_normal);
 
@@ -61,8 +67,8 @@ namespace AzToolsFramework
         // if an invalid ray intersection is attempted
         AZ::Vector3 localHitPosition = startInternal.m_localHitPosition;
         Internal::CalculateRayPlaneIntersectingPoint(
-            manipulatorInteraction.m_localRayOrigin, manipulatorInteraction.m_localRayDirection,
-            startInternal.m_localHitPosition, normal, localHitPosition);
+            manipulatorInteraction.m_localRayOrigin, manipulatorInteraction.m_localRayDirection, startInternal.m_localHitPosition, normal,
+            localHitPosition);
 
         localHitPosition = Internal::TryConstrainHitPositionToView(
             localHitPosition, startInternal.m_localHitPosition, worldFromLocal.GetInverse(),
@@ -126,8 +132,8 @@ namespace AzToolsFramework
         const AZ::Transform worldFromLocalUniformScale = TransformUniformScale(GetSpace());
 
         m_startInternal = CalculateManipulationDataStart(
-            m_fixed, worldFromLocalUniformScale, GetNonUniformScale(), TransformNormalizedScale(GetLocalTransform()),
-            interaction, rayIntersectionDistance);
+            m_fixed, worldFromLocalUniformScale, GetNonUniformScale(), TransformNormalizedScale(GetLocalTransform()), interaction,
+            rayIntersectionDistance);
 
         if (m_onLeftMouseDownCallback)
         {
@@ -180,9 +186,10 @@ namespace AzToolsFramework
 
                 // display the exact hit (ray intersection) of the mouse pick on the manipulator
                 DrawTransformAxes(
-                    debugDisplay, TransformUniformScale(GetSpace()) *
-                    AZ::Transform::CreateTranslation(
-                        action.m_start.m_localHitPosition + GetNonUniformScale() * action.m_current.m_localOffset));
+                    debugDisplay,
+                    TransformUniformScale(GetSpace()) *
+                        AZ::Transform::CreateTranslation(
+                            action.m_start.m_localHitPosition + GetNonUniformScale() * action.m_current.m_localOffset));
             }
 
             AZ::Transform combined = GetLocalTransform();
@@ -191,23 +198,16 @@ namespace AzToolsFramework
 
             DrawTransformAxes(debugDisplay, combined);
 
-            DrawAxis(
-                debugDisplay, combined.GetTranslation(),
-                TransformDirectionNoScaling(GetLocalTransform(), m_fixed.m_axis1));
-            DrawAxis(
-                debugDisplay, combined.GetTranslation(),
-                TransformDirectionNoScaling(GetLocalTransform(), m_fixed.m_axis2));
+            DrawAxis(debugDisplay, combined.GetTranslation(), TransformDirectionNoScaling(GetLocalTransform(), m_fixed.m_axis1));
+            DrawAxis(debugDisplay, combined.GetTranslation(), TransformDirectionNoScaling(GetLocalTransform(), m_fixed.m_axis2));
         }
 
         for (auto& view : m_manipulatorViews)
         {
             view->Draw(
-                GetManipulatorManagerId(), managerState,
-                GetManipulatorId(), {
-                    ApplySpace(GetLocalTransform()), GetNonUniformScale(),
-                    AZ::Vector3::CreateZero(), MouseOver()
-                },
-                debugDisplay, cameraState, mouseInteraction);
+                GetManipulatorManagerId(), managerState, GetManipulatorId(),
+                { ApplySpace(GetLocalTransform()), GetNonUniformScale(), AZ::Vector3::CreateZero(), MouseOver() }, debugDisplay,
+                cameraState, mouseInteraction);
         }
     }
 
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/PlanarManipulator.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/PlanarManipulator.h
index 154ed4c7d6..3bd028ec0a 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/PlanarManipulator.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/PlanarManipulator.h
@@ -1,14 +1,14 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
 #pragma once
 
@@ -23,13 +23,13 @@ namespace AzToolsFramework
     class ManipulatorView;
     struct GridSnapParameters;
 
-    /// PlanarManipulator serves as a visual tool for users to modify values
-    /// in two dimension in a plane defined two non-collinear axes in 3D space.
+    //! PlanarManipulator serves as a visual tool for users to modify values
+    //! in two dimension in a plane defined two non-collinear axes in 3D space.
     class PlanarManipulator
         : public BaseManipulator
         , public ManipulatorSpaceWithLocalTransform
     {
-        /// Private constructor.
+        //! Private constructor.
         explicit PlanarManipulator(const AZ::Transform& worldFromLocal);
 
     public:
@@ -42,43 +42,51 @@ namespace AzToolsFramework
 
         ~PlanarManipulator() = default;
 
-        /// A Manipulator must only be created and managed through a shared_ptr.
+        //! A Manipulator must only be created and managed through a shared_ptr.
         static AZStd::shared_ptr<PlanarManipulator> MakeShared(const AZ::Transform& worldFromLocal);
 
-        /// Unchanging data set once for the planar manipulator.
+        //! Unchanging data set once for the planar manipulator.
         struct Fixed
         {
-            AZ::Vector3 m_axis1 = AZ::Vector3::CreateAxisX(); ///< m_axis1 and m_axis2 have to be orthogonal, they together define a plane in 3d space.
+            AZ::Vector3 m_axis1 =
+                AZ::Vector3::CreateAxisX(); //!< m_axis1 and m_axis2 have to be orthogonal, they together define a plane in 3d space.
             AZ::Vector3 m_axis2 = AZ::Vector3::CreateAxisY();
-            AZ::Vector3 m_normal = AZ::Vector3::CreateAxisZ(); ///< m_normal is calculated automatically when setting the axes.
+            AZ::Vector3 m_normal = AZ::Vector3::CreateAxisZ(); //!< m_normal is calculated automatically when setting the axes.
         };
 
-        /// The state of the manipulator at the start of an interaction.
+        //! The state of the manipulator at the start of an interaction.
         struct Start
         {
-            AZ::Vector3 m_localPosition; ///< The current position of the manipulator in local space.
-            AZ::Vector3 m_localHitPosition; ///< The intersection point in local space between the ray and the manipulator when the mouse down event happens.
+            AZ::Vector3 m_localPosition; //!< The current position of the manipulator in local space.
+            AZ::Vector3 m_localHitPosition; //!< The intersection point in local space between the ray and the manipulator when the mouse
+                                            //!< down event happens.
         };
 
-        /// The state of the manipulator during an interaction.
+        //! The state of the manipulator during an interaction.
         struct Current
         {
-            AZ::Vector3 m_localOffset; ///< The current position of the manipulator in local space.
+            AZ::Vector3 m_localOffset; //!< The current position of the manipulator in local space.
         };
 
-        /// Mouse action data used by MouseActionCallback (wraps Start and Current manipulator state).
+        //! Mouse action data used by MouseActionCallback (wraps Start and Current manipulator state).
         struct Action
         {
             Fixed m_fixed;
             Start m_start;
             Current m_current;
             ViewportInteraction::KeyboardModifiers m_modifiers;
-            AZ::Vector3 LocalPosition() const { return m_start.m_localPosition + m_current.m_localOffset; }
-            AZ::Vector3 LocalPositionOffset() const { return m_current.m_localOffset; }
+            AZ::Vector3 LocalPosition() const
+            {
+                return m_start.m_localPosition + m_current.m_localOffset;
+            }
+            AZ::Vector3 LocalPositionOffset() const
+            {
+                return m_current.m_localOffset;
+            }
         };
 
-        /// This is the function signature of callbacks that will be invoked whenever a manipulator
-        /// is being clicked on or dragged.
+        //! This is the function signature of callbacks that will be invoked whenever a manipulator
+        //! is being clicked on or dragged.
         using MouseActionCallback = AZStd::function<void(const Action&)>;
 
         void InstallLeftMouseDownCallback(const MouseActionCallback& onMouseDownCallback);
@@ -91,11 +99,17 @@ namespace AzToolsFramework
             const AzFramework::CameraState& cameraState,
             const ViewportInteraction::MouseInteraction& mouseInteraction) override;
 
-        /// Ensure @param axis1 and @param axis2 are not collinear.
+        //! Ensure @param axis1 and @param axis2 are not collinear.
         void SetAxes(const AZ::Vector3& axis1, const AZ::Vector3& axis2);
 
-        const AZ::Vector3& GetAxis1() const { return m_fixed.m_axis1; }
-        const AZ::Vector3& GetAxis2() const { return m_fixed.m_axis2; }
+        const AZ::Vector3& GetAxis1() const
+        {
+            return m_fixed.m_axis1;
+        }
+        const AZ::Vector3& GetAxis2() const
+        {
+            return m_fixed.m_axis2;
+        }
 
         template<typename Views>
         void SetViews(Views&& views)
@@ -104,21 +118,19 @@ namespace AzToolsFramework
         }
 
     private:
-        void OnLeftMouseDownImpl(
-            const ViewportInteraction::MouseInteraction& interaction, float rayIntersectionDistance) override;
-        void OnLeftMouseUpImpl(
-            const ViewportInteraction::MouseInteraction& interaction) override;
-        void OnMouseMoveImpl(
-            const ViewportInteraction::MouseInteraction& interaction) override;
+        void OnLeftMouseDownImpl(const ViewportInteraction::MouseInteraction& interaction, float rayIntersectionDistance) override;
+        void OnLeftMouseUpImpl(const ViewportInteraction::MouseInteraction& interaction) override;
+        void OnMouseMoveImpl(const ViewportInteraction::MouseInteraction& interaction) override;
 
         void InvalidateImpl() override;
         void SetBoundsDirtyImpl() override;
 
-        /// Initial data recorded when a press first happens with a planar manipulator.
+        //! Initial data recorded when a press first happens with a planar manipulator.
         struct StartInternal
         {
-            AZ::Vector3 m_localPosition; ///< The starting position of the manipulator in local space.
-            AZ::Vector3 m_localHitPosition; ///< The intersection point in world space between the ray and the manipulator when the mouse down event happens.
+            AZ::Vector3 m_localPosition; //!< The starting position of the manipulator in local space.
+            AZ::Vector3 m_localHitPosition; //!< The intersection point in world space between the ray and the manipulator when the mouse
+                                            //!< down event happens.
         };
 
         Fixed m_fixed;
@@ -128,15 +140,23 @@ namespace AzToolsFramework
         MouseActionCallback m_onLeftMouseUpCallback = nullptr;
         MouseActionCallback m_onMouseMoveCallback = nullptr;
 
-        ManipulatorViews m_manipulatorViews; ///< Look of manipulator.
+        ManipulatorViews m_manipulatorViews; //!< Look of manipulator.
 
         static StartInternal CalculateManipulationDataStart(
-            const Fixed& fixed, const AZ::Transform& worldFromLocal, const AZ::Vector3& nonUniformScale,
-            const AZ::Transform& localTransform, const ViewportInteraction::MouseInteraction& interaction, float intersectionDistance);
+            const Fixed& fixed,
+            const AZ::Transform& worldFromLocal,
+            const AZ::Vector3& nonUniformScale,
+            const AZ::Transform& localTransform,
+            const ViewportInteraction::MouseInteraction& interaction,
+            float intersectionDistance);
 
         static Action CalculateManipulationDataAction(
-            const Fixed& fixed, const StartInternal& startInternal, const AZ::Transform& worldFromLocal, const AZ::Vector3& nonUniformScale,
-            const AZ::Transform& localTransform, const GridSnapParameters& gridSnapParams,
+            const Fixed& fixed,
+            const StartInternal& startInternal,
+            const AZ::Transform& worldFromLocal,
+            const AZ::Vector3& nonUniformScale,
+            const AZ::Transform& localTransform,
+            const GridSnapParameters& gridSnapParams,
             const ViewportInteraction::MouseInteraction& interaction);
     };
 } // namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/RotationManipulators.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/RotationManipulators.cpp
index 399bea4024..4bb39509e3 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/RotationManipulators.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/RotationManipulators.cpp
@@ -1,14 +1,14 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
 #include "RotationManipulators.h"
 
@@ -28,8 +28,7 @@ namespace AzToolsFramework
         m_manipulatorSpaceWithLocalTransform.SetSpace(worldFromLocal);
     }
 
-    void RotationManipulators::InstallLeftMouseDownCallback(
-        const AngularManipulator::MouseActionCallback& onMouseDownCallback)
+    void RotationManipulators::InstallLeftMouseDownCallback(const AngularManipulator::MouseActionCallback& onMouseDownCallback)
     {
         for (AZStd::shared_ptr<AngularManipulator>& manipulator : m_localAngularManipulators)
         {
@@ -39,8 +38,7 @@ namespace AzToolsFramework
         m_viewAngularManipulator->InstallLeftMouseDownCallback(onMouseDownCallback);
     }
 
-    void RotationManipulators::InstallMouseMoveCallback(
-        const AngularManipulator::MouseActionCallback& onMouseMoveCallback)
+    void RotationManipulators::InstallMouseMoveCallback(const AngularManipulator::MouseActionCallback& onMouseMoveCallback)
     {
         for (AZStd::shared_ptr<AngularManipulator>& manipulator : m_localAngularManipulators)
         {
@@ -50,8 +48,7 @@ namespace AzToolsFramework
         m_viewAngularManipulator->InstallMouseMoveCallback(onMouseMoveCallback);
     }
 
-    void RotationManipulators::InstallLeftMouseUpCallback(
-        const AngularManipulator::MouseActionCallback& onMouseUpCallback)
+    void RotationManipulators::InstallLeftMouseUpCallback(const AngularManipulator::MouseActionCallback& onMouseUpCallback)
     {
         for (AZStd::shared_ptr<AngularManipulator>& manipulator : m_localAngularManipulators)
         {
@@ -109,14 +106,13 @@ namespace AzToolsFramework
         m_viewAngularManipulator->SetSpace(worldFromLocal);
     }
 
-    void RotationManipulators::SetLocalAxes(
-        const AZ::Vector3& axis1, const AZ::Vector3& axis2, const AZ::Vector3& axis3)
+    void RotationManipulators::SetLocalAxes(const AZ::Vector3& axis1, const AZ::Vector3& axis2, const AZ::Vector3& axis3)
     {
         const AZ::Vector3 axes[] = { axis1, axis2, axis3 };
 
         for (size_t manipulatorIndex = 0; manipulatorIndex < m_localAngularManipulators.size(); ++manipulatorIndex)
         {
-           m_localAngularManipulators[manipulatorIndex]->SetAxis(axes[manipulatorIndex]);
+            m_localAngularManipulators[manipulatorIndex]->SetAxis(axes[manipulatorIndex]);
         }
     }
 
@@ -124,34 +120,25 @@ namespace AzToolsFramework
     {
         m_viewAngularManipulator->SetAxis(axis);
 
-        if (auto circleView = azrtti_cast<ManipulatorViewCircle*>(
-            m_viewAngularManipulator->GetView()))
+        if (auto circleView = azrtti_cast<ManipulatorViewCircle*>(m_viewAngularManipulator->GetView()))
         {
             circleView->m_axis = axis;
         }
     }
 
     void RotationManipulators::ConfigureView(
-        const float radius, const AZ::Color& axis1Color,
-        const AZ::Color& axis2Color, const AZ::Color& axis3Color)
+        const float radius, const AZ::Color& axis1Color, const AZ::Color& axis2Color, const AZ::Color& axis3Color)
     {
-        const AZ::Color colors[] = {
-            axis1Color, axis2Color, axis3Color
-        };
+        const AZ::Color colors[] = { axis1Color, axis2Color, axis3Color };
 
         for (size_t manipulatorIndex = 0; manipulatorIndex < m_localAngularManipulators.size(); ++manipulatorIndex)
         {
-            m_localAngularManipulators[manipulatorIndex]->SetView(
-                CreateManipulatorViewCircle(
-                    *m_localAngularManipulators[manipulatorIndex], colors[manipulatorIndex],
-                    radius, 0.05f, DrawHalfDottedCircle));
+            m_localAngularManipulators[manipulatorIndex]->SetView(CreateManipulatorViewCircle(
+                *m_localAngularManipulators[manipulatorIndex], colors[manipulatorIndex], radius, 0.05f, DrawHalfDottedCircle));
         }
 
-        m_viewAngularManipulator->SetView(
-            CreateManipulatorViewCircle(
-                *m_viewAngularManipulator,
-                AZ::Color(1.0f, 1.0f, 1.0f, 1.0f),
-                radius + (radius * 0.12f), 0.05f, DrawFullCircle));
+        m_viewAngularManipulator->SetView(CreateManipulatorViewCircle(
+            *m_viewAngularManipulator, AZ::Color(1.0f, 1.0f, 1.0f, 1.0f), radius + (radius * 0.12f), 0.05f, DrawFullCircle));
     }
 
     bool RotationManipulators::PerformingActionViewAxis() const
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/RotationManipulators.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/RotationManipulators.h
index 11b6e0838c..5ecfa21f26 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/RotationManipulators.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/RotationManipulators.h
@@ -1,27 +1,26 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
 #pragma once
 
 #include <AzCore/Memory/SystemAllocator.h>
-#include <AzToolsFramework/Manipulators/AngularManipulator.h>
 #include <AzToolsFramework/API/EditorCameraBus.h>
+#include <AzToolsFramework/Manipulators/AngularManipulator.h>
 
 namespace AzToolsFramework
 {
-    /// RotationManipulators is an aggregation of 3 angular manipulators who share the same origin
-    /// in addition to a view aligned angular manipulator (facing the camera).
-    class RotationManipulators
-        : public Manipulators
+    //! RotationManipulators is an aggregation of 3 angular manipulators who share the same origin
+    //! in addition to a view aligned angular manipulator (facing the camera).
+    class RotationManipulators : public Manipulators
     {
     public:
         AZ_RTTI(RotationManipulators, "{5D1F1D47-1D5B-4E42-B47E-23F108F8BF7D}")
@@ -40,12 +39,10 @@ namespace AzToolsFramework
         void SetLocalOrientationImpl(const AZ::Quaternion& localOrientation) override;
         void RefreshView(const AZ::Vector3& worldViewPosition) override;
 
-        void SetLocalAxes(
-            const AZ::Vector3& axis1, const AZ::Vector3& axis2, const AZ::Vector3& axis3);
+        void SetLocalAxes(const AZ::Vector3& axis1, const AZ::Vector3& axis2, const AZ::Vector3& axis3);
         void SetViewAxis(const AZ::Vector3& axis);
 
-        void ConfigureView(
-            float radius, const AZ::Color& axis1Color, const AZ::Color& axis2Color, const AZ::Color& axis3Color);
+        void ConfigureView(float radius, const AZ::Color& axis1Color, const AZ::Color& axis2Color, const AZ::Color& axis3Color);
 
         bool PerformingActionViewAxis() const;
 
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ScaleManipulators.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ScaleManipulators.cpp
index caeedd834f..079fde669a 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ScaleManipulators.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ScaleManipulators.cpp
@@ -1,14 +1,14 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
 #include "ScaleManipulators.h"
 
@@ -28,8 +28,7 @@ namespace AzToolsFramework
         m_manipulatorSpaceWithLocalTransform.SetSpace(worldFromLocal);
     }
 
-    void ScaleManipulators::InstallAxisLeftMouseDownCallback(
-        const LinearManipulator::MouseActionCallback& onMouseDownCallback)
+    void ScaleManipulators::InstallAxisLeftMouseDownCallback(const LinearManipulator::MouseActionCallback& onMouseDownCallback)
     {
         for (AZStd::shared_ptr<LinearManipulator>& manipulator : m_axisScaleManipulators)
         {
@@ -37,8 +36,7 @@ namespace AzToolsFramework
         }
     }
 
-    void ScaleManipulators::InstallAxisMouseMoveCallback(
-        const LinearManipulator::MouseActionCallback& onMouseMoveCallback)
+    void ScaleManipulators::InstallAxisMouseMoveCallback(const LinearManipulator::MouseActionCallback& onMouseMoveCallback)
     {
         for (AZStd::shared_ptr<LinearManipulator>& manipulator : m_axisScaleManipulators)
         {
@@ -46,8 +44,7 @@ namespace AzToolsFramework
         }
     }
 
-    void ScaleManipulators::InstallAxisLeftMouseUpCallback(
-        const LinearManipulator::MouseActionCallback& onMouseUpCallback)
+    void ScaleManipulators::InstallAxisLeftMouseUpCallback(const LinearManipulator::MouseActionCallback& onMouseUpCallback)
     {
         for (AZStd::shared_ptr<LinearManipulator>& manipulator : m_axisScaleManipulators)
         {
@@ -55,22 +52,19 @@ namespace AzToolsFramework
         }
     }
 
-    void ScaleManipulators::InstallUniformLeftMouseDownCallback(
-        const LinearManipulator::MouseActionCallback& onMouseDownCallback)
+    void ScaleManipulators::InstallUniformLeftMouseDownCallback(const LinearManipulator::MouseActionCallback& onMouseDownCallback)
     {
         m_uniformScaleManipulator->InstallLeftMouseDownCallback(onMouseDownCallback);
     }
 
-    void ScaleManipulators::InstallUniformMouseMoveCallback(
-        const LinearManipulator::MouseActionCallback& onMouseMoveCallback)
+    void ScaleManipulators::InstallUniformMouseMoveCallback(const LinearManipulator::MouseActionCallback& onMouseMoveCallback)
     {
-         m_uniformScaleManipulator->InstallMouseMoveCallback(onMouseMoveCallback);
+        m_uniformScaleManipulator->InstallMouseMoveCallback(onMouseMoveCallback);
     }
 
-    void ScaleManipulators::InstallUniformLeftMouseUpCallback(
-        const LinearManipulator::MouseActionCallback& onMouseUpCallback)
+    void ScaleManipulators::InstallUniformLeftMouseUpCallback(const LinearManipulator::MouseActionCallback& onMouseUpCallback)
     {
-         m_uniformScaleManipulator->InstallLeftMouseUpCallback(onMouseUpCallback);
+        m_uniformScaleManipulator->InstallLeftMouseUpCallback(onMouseUpCallback);
     }
 
     void ScaleManipulators::SetLocalTransformImpl(const AZ::Transform& localTransform)
@@ -80,8 +74,7 @@ namespace AzToolsFramework
             manipulator->SetLocalTransform(localTransform);
         }
 
-        m_uniformScaleManipulator->SetVisualOrientationOverride(
-            QuaternionFromTransformNoScaling(localTransform));
+        m_uniformScaleManipulator->SetVisualOrientationOverride(QuaternionFromTransformNoScaling(localTransform));
         m_uniformScaleManipulator->SetLocalOrientation(AZ::Quaternion::CreateIdentity());
     }
 
@@ -113,14 +106,13 @@ namespace AzToolsFramework
         m_uniformScaleManipulator->SetSpace(worldFromLocal);
     }
 
-    void ScaleManipulators::SetAxes(
-        const AZ::Vector3& axis1, const AZ::Vector3& axis2, const AZ::Vector3& axis3)
+    void ScaleManipulators::SetAxes(const AZ::Vector3& axis1, const AZ::Vector3& axis2, const AZ::Vector3& axis3)
     {
-         AZ::Vector3 axes[] = { axis1, axis2, axis3 };
+        AZ::Vector3 axes[] = { axis1, axis2, axis3 };
 
         for (size_t manipulatorIndex = 0; manipulatorIndex < m_axisScaleManipulators.size(); ++manipulatorIndex)
         {
-           m_axisScaleManipulators[manipulatorIndex]->SetAxis(axes[manipulatorIndex]);
+            m_axisScaleManipulators[manipulatorIndex]->SetAxis(axes[manipulatorIndex]);
         }
 
         // uniform scale manipulator uses Z axis for scaling (always in world space)
@@ -129,32 +121,27 @@ namespace AzToolsFramework
     }
 
     void ScaleManipulators::ConfigureView(
-        const float axisLength, const AZ::Color& axis1Color,
-        const AZ::Color& axis2Color, const AZ::Color& axis3Color)
+        const float axisLength, const AZ::Color& axis1Color, const AZ::Color& axis2Color, const AZ::Color& axis3Color)
     {
         const float boxSize = 0.1f;
         const float lineWidth = 0.05f;
 
-        const AZ::Color colors[] = {
-            axis1Color, axis2Color, axis3Color
-        };
+        const AZ::Color colors[] = { axis1Color, axis2Color, axis3Color };
 
         for (size_t manipulatorIndex = 0; manipulatorIndex < m_axisScaleManipulators.size(); ++manipulatorIndex)
         {
             ManipulatorViews views;
-            views.emplace_back(CreateManipulatorViewLine(
-                *m_axisScaleManipulators[manipulatorIndex], colors[manipulatorIndex], axisLength, lineWidth));
+            views.emplace_back(
+                CreateManipulatorViewLine(*m_axisScaleManipulators[manipulatorIndex], colors[manipulatorIndex], axisLength, lineWidth));
             views.emplace_back(CreateManipulatorViewBox(
                 AZ::Transform::CreateIdentity(), colors[manipulatorIndex],
-                m_axisScaleManipulators[manipulatorIndex]->GetAxis() * (axisLength - boxSize),
-                AZ::Vector3(boxSize)));
+                m_axisScaleManipulators[manipulatorIndex]->GetAxis() * (axisLength - boxSize), AZ::Vector3(boxSize)));
             m_axisScaleManipulators[manipulatorIndex]->SetViews(AZStd::move(views));
         }
 
         ManipulatorViews views;
         views.emplace_back(CreateManipulatorViewBox(
-            AZ::Transform::CreateIdentity(), AZ::Color::CreateOne(),
-            AZ::Vector3::CreateZero(), AZ::Vector3(boxSize)));
+            AZ::Transform::CreateIdentity(), AZ::Color::CreateOne(), AZ::Vector3::CreateZero(), AZ::Vector3(boxSize)));
         m_uniformScaleManipulator->SetViews(AZStd::move(views));
     }
 
@@ -167,4 +154,4 @@ namespace AzToolsFramework
 
         manipulatorFn(m_uniformScaleManipulator.get());
     }
-}
+} // namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ScaleManipulators.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ScaleManipulators.h
index 24df3cda7b..b06d8f92c5 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ScaleManipulators.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ScaleManipulators.h
@@ -1,14 +1,14 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
 #pragma once
 
@@ -17,11 +17,10 @@
 
 namespace AzToolsFramework
 {
-    /// ScaleManipulators is an aggregation of 3 linear manipulators for each basis axis who share
-    /// the same transform, and a single linear manipulator at the center of the transform whose
-    /// axis is world up (z).
-    class ScaleManipulators
-        : public Manipulators
+    //! ScaleManipulators is an aggregation of 3 linear manipulators for each basis axis who share
+    //! the same transform, and a single linear manipulator at the center of the transform whose
+    //! axis is world up (z).
+    class ScaleManipulators : public Manipulators
     {
     public:
         AZ_RTTI(ScaleManipulators, "{C6350CE0-7B7A-46F8-B65F-D4A54DD9A7D9}")
@@ -42,16 +41,9 @@ namespace AzToolsFramework
         void SetLocalPositionImpl(const AZ::Vector3& localPosition) override;
         void SetLocalOrientationImpl(const AZ::Quaternion& localOrientation) override;
 
-        void SetAxes(
-            const AZ::Vector3& axis1,
-            const AZ::Vector3& axis2,
-            const AZ::Vector3& axis3);
+        void SetAxes(const AZ::Vector3& axis1, const AZ::Vector3& axis2, const AZ::Vector3& axis3);
 
-        void ConfigureView(
-            float axisLength,
-            const AZ::Color& axis1Color,
-            const AZ::Color& axis2Color,
-            const AZ::Color& axis3Color);
+        void ConfigureView(float axisLength, const AZ::Color& axis1Color, const AZ::Color& axis2Color, const AZ::Color& axis3Color);
 
     private:
         AZ_DISABLE_COPY_MOVE(ScaleManipulators)
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SelectionManipulator.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SelectionManipulator.cpp
index 4925651580..3071ca74ae 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SelectionManipulator.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SelectionManipulator.cpp
@@ -1,14 +1,14 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
 #include "SelectionManipulator.h"
 
@@ -16,8 +16,8 @@
 
 namespace AzToolsFramework
 {
-    AZStd::shared_ptr<SelectionManipulator> SelectionManipulator::MakeShared(const AZ::Transform& worldFromLocal,
-        const AZ::Vector3& nonUniformScale)
+    AZStd::shared_ptr<SelectionManipulator> SelectionManipulator::MakeShared(
+        const AZ::Transform& worldFromLocal, const AZ::Vector3& nonUniformScale)
     {
         return AZStd::shared_ptr<SelectionManipulator>(aznew SelectionManipulator(worldFromLocal, nonUniformScale));
     }
@@ -93,12 +93,9 @@ namespace AzToolsFramework
         for (auto& view : m_manipulatorViews)
         {
             view->Draw(
-                GetManipulatorManagerId(), managerState,
-                GetManipulatorId(), {
-                    TransformUniformScale(GetSpace()), GetNonUniformScale(),
-                    GetLocalPosition(), MouseOver()
-                },
-                debugDisplay, cameraState, mouseInteraction);
+                GetManipulatorManagerId(), managerState, GetManipulatorId(),
+                { TransformUniformScale(GetSpace()), GetNonUniformScale(), GetLocalPosition(), MouseOver() }, debugDisplay, cameraState,
+                mouseInteraction);
         }
     }
 
@@ -117,4 +114,4 @@ namespace AzToolsFramework
             view->Invalidate(GetManipulatorManagerId());
         }
     }
-}
+} // namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SelectionManipulator.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SelectionManipulator.h
index 1ae6ceb729..b862dfd684 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SelectionManipulator.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SelectionManipulator.h
@@ -1,14 +1,14 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
 #pragma once
 
@@ -20,13 +20,13 @@ namespace AzToolsFramework
 {
     class ManipulatorView;
 
-    /// Represents a sphere that can be clicked on to trigger a particular behavior
-    /// For example clicking a preview point to create a translation manipulator.
+    //! Represents a sphere that can be clicked on to trigger a particular behavior.
+    //! For example clicking a preview point to create a translation manipulator.
     class SelectionManipulator
         : public BaseManipulator
         , public ManipulatorSpaceWithLocalPosition
     {
-        /// Private constructor.
+        //! Private constructor.
         SelectionManipulator(const AZ::Transform& worldFromLocal, const AZ::Vector3& nonUniformScale = AZ::Vector3::CreateOne());
 
     public:
@@ -39,12 +39,12 @@ namespace AzToolsFramework
 
         ~SelectionManipulator() = default;
 
-        /// A Manipulator must only be created and managed through a shared_ptr.
-        static AZStd::shared_ptr<SelectionManipulator> MakeShared(const AZ::Transform& worldFromLocal,
-            const AZ::Vector3& nonUniformScale = AZ::Vector3::CreateOne());
+        //! A Manipulator must only be created and managed through a shared_ptr.
+        static AZStd::shared_ptr<SelectionManipulator> MakeShared(
+            const AZ::Transform& worldFromLocal, const AZ::Vector3& nonUniformScale = AZ::Vector3::CreateOne());
 
-        /// This is the function signature of callbacks that will be invoked
-        /// whenever a selection manipulator is clicked on.
+        //! This is the function signature of callbacks that will be invoked
+        //! whenever a selection manipulator is clicked on.
         using MouseActionCallback = AZStd::function<void(const ViewportInteraction::MouseInteraction&)>;
 
         void InstallLeftMouseDownCallback(const MouseActionCallback& onMouseDownCallback);
@@ -58,10 +58,25 @@ namespace AzToolsFramework
             const AzFramework::CameraState& cameraState,
             const ViewportInteraction::MouseInteraction& mouseInteraction) override;
 
-        bool Selected() const { return m_selected; }
-        void Select() { m_selected = true; }
-        void Deselect() { m_selected = false; }
-        void ToggleSelected() { m_selected = !m_selected; }
+        bool Selected() const
+        {
+            return m_selected;
+        }
+
+        void Select()
+        {
+            m_selected = true;
+        }
+
+        void Deselect()
+        {
+            m_selected = false;
+        }
+
+        void ToggleSelected()
+        {
+            m_selected = !m_selected;
+        }
 
         template<typename Views>
         void SetViews(Views&& views)
@@ -70,13 +85,9 @@ namespace AzToolsFramework
         }
 
     private:
-        void OnLeftMouseDownImpl(
-            const ViewportInteraction::MouseInteraction& interaction,
-            float rayIntersectionDistance) override;
+        void OnLeftMouseDownImpl(const ViewportInteraction::MouseInteraction& interaction, float rayIntersectionDistance) override;
         void OnLeftMouseUpImpl(const ViewportInteraction::MouseInteraction& interaction) override;
-        void OnRightMouseDownImpl(
-            const ViewportInteraction::MouseInteraction& interaction,
-            float rayIntersectionDistance) override;
+        void OnRightMouseDownImpl(const ViewportInteraction::MouseInteraction& interaction, float rayIntersectionDistance) override;
         void OnRightMouseUpImpl(const ViewportInteraction::MouseInteraction& interaction) override;
 
         void InvalidateImpl() override;
@@ -89,6 +100,6 @@ namespace AzToolsFramework
         MouseActionCallback m_onRightMouseDownCallback = nullptr;
         MouseActionCallback m_onRightMouseUpCallback = nullptr;
 
-        ManipulatorViews m_manipulatorViews; ///< Look of manipulator.
+        ManipulatorViews m_manipulatorViews; //!< Look of manipulator.
     };
 } // namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SplineHoverSelection.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SplineHoverSelection.cpp
index 43fbbce80b..98972bcf33 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SplineHoverSelection.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SplineHoverSelection.cpp
@@ -1,14 +1,14 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
 #include "SplineHoverSelection.h"
 
@@ -20,11 +20,12 @@
 
 namespace AzToolsFramework
 {
-    static const AZ::Color s_splineSelectManipulatorColor = AZ::Color(0.0f, 1.0f, 0.0f, 1.0f);
+    static const AZ::Color SplineSelectManipulatorColor = AZ::Color(0.0f, 1.0f, 0.0f, 1.0f);
 
     SplineHoverSelection::SplineHoverSelection(
         const AZ::EntityComponentIdPair& entityComponentIdPair,
-        const ManipulatorManagerId managerId, const AZStd::shared_ptr<AZ::Spline>& spline)
+        const ManipulatorManagerId managerId,
+        const AZStd::shared_ptr<AZ::Spline>& spline)
     {
         m_splineSelectionManipulator = SplineSelectionManipulator::MakeShared();
         m_splineSelectionManipulator->Register(managerId);
@@ -33,16 +34,14 @@ namespace AzToolsFramework
 
         const float splineWidth = 0.05f;
         m_splineSelectionManipulator->SetSpline(spline);
-        m_splineSelectionManipulator->SetView(CreateManipulatorViewSplineSelect(
-            *m_splineSelectionManipulator, s_splineSelectManipulatorColor, splineWidth));
+        m_splineSelectionManipulator->SetView(
+            CreateManipulatorViewSplineSelect(*m_splineSelectionManipulator, SplineSelectManipulatorColor, splineWidth));
 
         m_splineSelectionManipulator->InstallLeftMouseUpCallback(
             [entityComponentIdPair](const SplineSelectionManipulator::Action& action)
-        {
-            InsertVertexAfter(
-                entityComponentIdPair, action.m_splineAddress.m_segmentIndex,
-                action.m_localSplineHitPosition);
-        });
+            {
+                InsertVertexAfter(entityComponentIdPair, action.m_splineAddress.m_segmentIndex, action.m_localSplineHitPosition);
+            });
     }
 
     SplineHoverSelection::~SplineHoverSelection()
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SplineHoverSelection.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SplineHoverSelection.h
index 11b10f8516..d8dcd573af 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SplineHoverSelection.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SplineHoverSelection.h
@@ -1,14 +1,14 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
 #pragma once
 
@@ -19,20 +19,20 @@ namespace AZ
 {
     class Spline;
     class EntityComponentIdPair;
-}
+} // namespace AZ
 
 namespace AzToolsFramework
 {
     class SplineSelectionManipulator;
 
-    /// SplineHoverSelection is a concrete implementation of HoverSelection wrapping a Spline and
-    /// SplineManipulator. The underlying manipulators are used to control selection.
-    class SplineHoverSelection
-        : public HoverSelection
+    //! SplineHoverSelection is a concrete implementation of HoverSelection wrapping a Spline and
+    //! SplineManipulator. The underlying manipulators are used to control selection.
+    class SplineHoverSelection : public HoverSelection
     {
     public:
         explicit SplineHoverSelection(
-            const AZ::EntityComponentIdPair& entityComponentIdPair, ManipulatorManagerId managerId,
+            const AZ::EntityComponentIdPair& entityComponentIdPair,
+            ManipulatorManagerId managerId,
             const AZStd::shared_ptr<AZ::Spline>& spline);
         SplineHoverSelection(const SplineHoverSelection&) = delete;
         SplineHoverSelection& operator=(const SplineHoverSelection&) = delete;
@@ -46,6 +46,6 @@ namespace AzToolsFramework
         void SetNonUniformScale(const AZ::Vector3& nonUniformScale) override;
 
     private:
-        AZStd::shared_ptr<SplineSelectionManipulator> m_splineSelectionManipulator; ///< Manipulator for adding points to spline.
+        AZStd::shared_ptr<SplineSelectionManipulator> m_splineSelectionManipulator; //!< Manipulator for adding points to spline.
     };
 } // namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SplineSelectionManipulator.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SplineSelectionManipulator.cpp
index 5bfccefe48..39dbcb67fa 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SplineSelectionManipulator.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SplineSelectionManipulator.cpp
@@ -1,14 +1,14 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
 #include "SplineSelectionManipulator.h"
 
@@ -18,8 +18,10 @@
 namespace AzToolsFramework
 {
     SplineSelectionManipulator::Action CalculateManipulationDataAction(
-        const AZ::Transform& worldFromLocal, const AZ::Vector3& rayOrigin,
-        const AZ::Vector3& rayDirection, const AZStd::weak_ptr<const AZ::Spline>& spline)
+        const AZ::Transform& worldFromLocal,
+        const AZ::Vector3& rayOrigin,
+        const AZ::Vector3& rayDirection,
+        const AZStd::weak_ptr<const AZ::Spline>& spline)
     {
         SplineSelectionManipulator::Action action;
         if (const AZStd::shared_ptr<const AZ::Spline> splinePtr = spline.lock())
@@ -65,9 +67,7 @@ namespace AzToolsFramework
         if (m_onLeftMouseDownCallback)
         {
             m_onLeftMouseDownCallback(CalculateManipulationDataAction(
-                TransformUniformScale(GetSpace()),
-                interaction.m_mousePick.m_rayOrigin,
-                interaction.m_mousePick.m_rayDirection, m_spline));
+                TransformUniformScale(GetSpace()), interaction.m_mousePick.m_rayOrigin, interaction.m_mousePick.m_rayDirection, m_spline));
         }
     }
 
@@ -76,9 +76,7 @@ namespace AzToolsFramework
         if (MouseOver() && m_onLeftMouseUpCallback)
         {
             m_onLeftMouseUpCallback(CalculateManipulationDataAction(
-                TransformUniformScale(GetSpace()),
-                interaction.m_mousePick.m_rayOrigin,
-                interaction.m_mousePick.m_rayDirection, m_spline));
+                TransformUniformScale(GetSpace()), interaction.m_mousePick.m_rayOrigin, interaction.m_mousePick.m_rayDirection, m_spline));
         }
     }
 
@@ -99,12 +97,9 @@ namespace AzToolsFramework
         if (mouseInteraction.m_keyboardModifiers.Ctrl() && !mouseInteraction.m_keyboardModifiers.Shift())
         {
             m_manipulatorView->Draw(
-                GetManipulatorManagerId(), managerState,
-                GetManipulatorId(), {
-                    TransformUniformScale(GetSpace()), GetNonUniformScale(),
-                    AZ::Vector3::CreateZero(), MouseOver()
-                },
-                debugDisplay, cameraState, mouseInteraction);
+                GetManipulatorManagerId(), managerState, GetManipulatorId(),
+                { TransformUniformScale(GetSpace()), GetNonUniformScale(), AZ::Vector3::CreateZero(), MouseOver() }, debugDisplay,
+                cameraState, mouseInteraction);
         }
     }
 
@@ -122,4 +117,4 @@ namespace AzToolsFramework
     {
         m_manipulatorView->Invalidate(GetManipulatorManagerId());
     }
-}
+} // namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SplineSelectionManipulator.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SplineSelectionManipulator.h
index 721c3413ef..e1a2fe26ab 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SplineSelectionManipulator.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SplineSelectionManipulator.h
@@ -1,14 +1,14 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
 #pragma once
 
@@ -23,13 +23,13 @@ namespace AzToolsFramework
 {
     class ManipulatorView;
 
-    /// A manipulator to represent selection of a spline. Underlying spline data is
-    /// used to test mouse picking ray against to preview closest point on spline.
+    //! A manipulator to represent selection of a spline. Underlying spline data is
+    //! used to test mouse picking ray against to preview closest point on spline.
     class SplineSelectionManipulator
         : public BaseManipulator
         , public ManipulatorSpace
     {
-        /// Private constructor.
+        //! Private constructor.
         SplineSelectionManipulator();
 
     public:
@@ -41,10 +41,10 @@ namespace AzToolsFramework
 
         ~SplineSelectionManipulator();
 
-        /// A Manipulator must only be created and managed through a shared_ptr.
+        //! A Manipulator must only be created and managed through a shared_ptr.
         static AZStd::shared_ptr<SplineSelectionManipulator> MakeShared();
 
-        /// Mouse action data used by MouseActionCallback.
+        //! Mouse action data used by MouseActionCallback.
         struct Action
         {
             AZ::Vector3 m_localSplineHitPosition;
@@ -62,29 +62,36 @@ namespace AzToolsFramework
             const AzFramework::CameraState& cameraState,
             const ViewportInteraction::MouseInteraction& mouseInteraction) override;
 
-        void SetSpline(AZStd::shared_ptr<const AZ::Spline> spline) { m_spline = AZStd::move(spline); }
-        AZStd::weak_ptr<const AZ::Spline> GetSpline() const { return m_spline; }
+        void SetSpline(AZStd::shared_ptr<const AZ::Spline> spline)
+        {
+            m_spline = AZStd::move(spline);
+        }
+        AZStd::weak_ptr<const AZ::Spline> GetSpline() const
+        {
+            return m_spline;
+        }
 
         void SetView(AZStd::unique_ptr<ManipulatorView>&& view);
 
     private:
-        void OnLeftMouseDownImpl(
-            const ViewportInteraction::MouseInteraction& interaction, float rayIntersectionDistance) override;
-        void OnLeftMouseUpImpl(
-            const ViewportInteraction::MouseInteraction& interaction) override;
+        void OnLeftMouseDownImpl(const ViewportInteraction::MouseInteraction& interaction, float rayIntersectionDistance) override;
+        void OnLeftMouseUpImpl(const ViewportInteraction::MouseInteraction& interaction) override;
 
         void InvalidateImpl() override;
         void SetBoundsDirtyImpl() override;
 
         AZStd::weak_ptr<const AZ::Spline> m_spline;
-        AZStd::unique_ptr<ManipulatorView> m_manipulatorView = nullptr; ///< Look of manipulator and bounds for interaction.
+        AZStd::unique_ptr<ManipulatorView> m_manipulatorView = nullptr; //!< Look of manipulator and bounds for interaction.
         MouseActionCallback m_onLeftMouseDownCallback = nullptr;
         MouseActionCallback m_onLeftMouseUpCallback = nullptr;
-        ViewportInteraction::KeyboardModifiers m_keyboardModifiers; ///< What modifier keys are pressed when interacting with this manipulator.
+        ViewportInteraction::KeyboardModifiers
+            m_keyboardModifiers; //!< What modifier keys are pressed when interacting with this manipulator.
     };
 
     SplineSelectionManipulator::Action CalculateManipulationDataAction(
-        const AZ::Transform& worldFromLocal, const AZ::Vector3& rayOrigin,
-        const AZ::Vector3& rayDirection, const AZStd::weak_ptr<const AZ::Spline>& spline);
+        const AZ::Transform& worldFromLocal,
+        const AZ::Vector3& rayOrigin,
+        const AZ::Vector3& rayDirection,
+        const AZStd::weak_ptr<const AZ::Spline>& spline);
 
 } // namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SurfaceManipulator.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SurfaceManipulator.cpp
index f570c20a7e..aa3f3f5882 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SurfaceManipulator.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SurfaceManipulator.cpp
@@ -1,14 +1,14 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
 #include "SurfaceManipulator.h"
 
@@ -18,19 +18,22 @@
 namespace AzToolsFramework
 {
     SurfaceManipulator::StartInternal SurfaceManipulator::CalculateManipulationDataStart(
-        const AZ::Transform& worldFromLocal, const AZ::Vector3& worldSurfacePosition,
-        const AZ::Vector3& localStartPosition, const bool snapping, const float gridSize, const int viewportId)
+        const AZ::Transform& worldFromLocal,
+        const AZ::Vector3& worldSurfacePosition,
+        const AZ::Vector3& localStartPosition,
+        const bool snapping,
+        const float gridSize,
+        const int viewportId)
     {
         const AZ::Transform worldFromLocalUniform = AzToolsFramework::TransformUniformScale(worldFromLocal);
         const AZ::Transform localFromWorldUniform = worldFromLocalUniform.GetInverse();
 
         const AZ::Vector3 localFinalSurfacePosition = snapping
-            ? CalculateSnappedTerrainPosition(
-                // note: gridSize is not scaled by scaleRecip here as localStartPosition is
-                // unscaled itself so the position returned by CalculateSnappedTerrainPosition
-                // must be in the same space (if localStartPosition were also scaled, gridSize
-                // would need to be multiplied by scaleRecip)
-                worldSurfacePosition, worldFromLocalUniform, viewportId, gridSize)
+            // note: gridSize is not scaled by scaleRecip here as localStartPosition is
+            // unscaled itself so the position returned by CalculateSnappedTerrainPosition
+            // must be in the same space (if localStartPosition were also scaled, gridSize
+            // would need to be multiplied by scaleRecip)
+            ? CalculateSnappedTerrainPosition(worldSurfacePosition, worldFromLocalUniform, viewportId, gridSize)
             : localFromWorldUniform.TransformPoint(worldSurfacePosition);
 
         // delta/offset between initial vertex position and terrain pick position
@@ -44,9 +47,13 @@ namespace AzToolsFramework
     }
 
     SurfaceManipulator::Action SurfaceManipulator::CalculateManipulationDataAction(
-        const StartInternal& startInternal, const AZ::Transform& worldFromLocal,
-        const AZ::Vector3& worldSurfacePosition, const bool snapping, const float gridSize,
-        const ViewportInteraction::KeyboardModifiers keyboardModifiers, const int viewportId)
+        const StartInternal& startInternal,
+        const AZ::Transform& worldFromLocal,
+        const AZ::Vector3& worldSurfacePosition,
+        const bool snapping,
+        const float gridSize,
+        const ViewportInteraction::KeyboardModifiers keyboardModifiers,
+        const int viewportId)
     {
         const AZ::Transform worldFromLocalUniform = AzToolsFramework::TransformUniformScale(worldFromLocal);
         const AZ::Transform localFromWorldUniform = worldFromLocalUniform.GetInverse();
@@ -54,8 +61,7 @@ namespace AzToolsFramework
         const float scaleRecip = ScaleReciprocal(worldFromLocalUniform);
 
         const AZ::Vector3 localFinalSurfacePosition = snapping
-            ? CalculateSnappedTerrainPosition(
-                worldSurfacePosition, worldFromLocalUniform, viewportId, gridSize * scaleRecip)
+            ? CalculateSnappedTerrainPosition(worldSurfacePosition, worldFromLocalUniform, viewportId, gridSize * scaleRecip)
             : localFromWorldUniform.TransformPoint(worldSurfacePosition);
 
         Action action;
@@ -106,17 +112,14 @@ namespace AzToolsFramework
             interaction.m_mousePick.m_screenCoordinates);
 
         m_startInternal = CalculateManipulationDataStart(
-            worldFromLocalUniformScale, worldSurfacePosition, GetLocalPosition(),
-            gridSnapParams.m_gridSnap, gridSnapParams.m_gridSize,
+            worldFromLocalUniformScale, worldSurfacePosition, GetLocalPosition(), gridSnapParams.m_gridSnap, gridSnapParams.m_gridSize,
             interaction.m_interactionId.m_viewportId);
 
         if (m_onLeftMouseDownCallback)
         {
             m_onLeftMouseDownCallback(CalculateManipulationDataAction(
-                m_startInternal, worldFromLocalUniformScale, worldSurfacePosition,
-                gridSnapParams.m_gridSnap, gridSnapParams.m_gridSize,
-                interaction.m_keyboardModifiers,
-                interaction.m_interactionId.m_viewportId));
+                m_startInternal, worldFromLocalUniformScale, worldSurfacePosition, gridSnapParams.m_gridSnap, gridSnapParams.m_gridSize,
+                interaction.m_keyboardModifiers, interaction.m_interactionId.m_viewportId));
         }
     }
 
@@ -133,10 +136,8 @@ namespace AzToolsFramework
             const GridSnapParameters gridSnapParams = GridSnapSettings(interaction.m_interactionId.m_viewportId);
 
             m_onLeftMouseUpCallback(CalculateManipulationDataAction(
-                m_startInternal, TransformUniformScale(GetSpace()), worldSurfacePosition,
-                gridSnapParams.m_gridSnap,
-                gridSnapParams.m_gridSize,
-                interaction.m_keyboardModifiers, interaction.m_interactionId.m_viewportId));
+                m_startInternal, TransformUniformScale(GetSpace()), worldSurfacePosition, gridSnapParams.m_gridSnap,
+                gridSnapParams.m_gridSize, interaction.m_keyboardModifiers, interaction.m_interactionId.m_viewportId));
         }
     }
 
@@ -153,10 +154,8 @@ namespace AzToolsFramework
             const GridSnapParameters gridSnapParams = GridSnapSettings(interaction.m_interactionId.m_viewportId);
 
             m_onMouseMoveCallback(CalculateManipulationDataAction(
-                m_startInternal, TransformUniformScale(GetSpace()), worldSurfacePosition,
-                gridSnapParams.m_gridSnap,
-                gridSnapParams.m_gridSize,
-                interaction.m_keyboardModifiers, interaction.m_interactionId.m_viewportId));
+                m_startInternal, TransformUniformScale(GetSpace()), worldSurfacePosition, gridSnapParams.m_gridSnap,
+                gridSnapParams.m_gridSize, interaction.m_keyboardModifiers, interaction.m_interactionId.m_viewportId));
         }
     }
 
@@ -172,12 +171,9 @@ namespace AzToolsFramework
         const ViewportInteraction::MouseInteraction& mouseInteraction)
     {
         m_manipulatorView->Draw(
-            GetManipulatorManagerId(), managerState,
-            GetManipulatorId(), {
-                TransformUniformScale(GetSpace()), GetNonUniformScale(),
-                GetLocalPosition(), MouseOver()
-            },
-            debugDisplay, cameraState, mouseInteraction);
+            GetManipulatorManagerId(), managerState, GetManipulatorId(),
+            { TransformUniformScale(GetSpace()), GetNonUniformScale(), GetLocalPosition(), MouseOver() }, debugDisplay, cameraState,
+            mouseInteraction);
     }
 
     void SurfaceManipulator::InvalidateImpl()
@@ -189,4 +185,4 @@ namespace AzToolsFramework
     {
         m_manipulatorView = AZStd::move(view);
     }
-}
+} // namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SurfaceManipulator.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SurfaceManipulator.h
index 72eb3a5cda..6461954353 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SurfaceManipulator.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SurfaceManipulator.h
@@ -1,14 +1,14 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
 #pragma once
 
@@ -21,13 +21,13 @@ namespace AzToolsFramework
 {
     class ManipulatorView;
 
-    /// Surface manipulator will ensure the point(s) it controls snap precisely to the xy grid
-    /// while also staying aligned exactly to the height of the terrain.
+    //! Surface manipulator will ensure the point(s) it controls snap precisely to the xy grid
+    //! while also staying aligned exactly to the height of the terrain.
     class SurfaceManipulator
         : public BaseManipulator
         , public ManipulatorSpaceWithLocalPosition
     {
-        /// Private constructor.
+        //! Private constructor.
         explicit SurfaceManipulator(const AZ::Transform& worldFromLocal);
 
     public:
@@ -40,30 +40,36 @@ namespace AzToolsFramework
 
         ~SurfaceManipulator() = default;
 
-        /// A Manipulator must only be created and managed through a shared_ptr.
+        //! A Manipulator must only be created and managed through a shared_ptr.
         static AZStd::shared_ptr<SurfaceManipulator> MakeShared(const AZ::Transform& worldFromLocal);
 
-        /// The state of the manipulator at the start of an interaction.
+        //! The state of the manipulator at the start of an interaction.
         struct Start
         {
-            AZ::Vector3 m_localPosition; ///< The current position of the manipulator in local space.
-            AZ::Vector3 m_snapOffset; ///< The snap offset amount to ensure manipulator is aligned to the grid.
+            AZ::Vector3 m_localPosition; //!< The current position of the manipulator in local space.
+            AZ::Vector3 m_snapOffset; //!< The snap offset amount to ensure manipulator is aligned to the grid.
         };
 
-        /// The state of the manipulator during an interaction.
+        //! The state of the manipulator during an interaction.
         struct Current
         {
-            AZ::Vector3 m_localOffset; ///< The current offset of the manipulator from its starting position in local space.
+            AZ::Vector3 m_localOffset; //!< The current offset of the manipulator from its starting position in local space.
         };
 
-        /// Mouse action data used by MouseActionCallback (wraps Start and Current manipulator state).
+        //! Mouse action data used by MouseActionCallback (wraps Start and Current manipulator state).
         struct Action
         {
             Start m_start;
             Current m_current;
             ViewportInteraction::KeyboardModifiers m_modifiers;
-            AZ::Vector3 LocalPosition() const { return m_start.m_localPosition + m_current.m_localOffset; }
-            AZ::Vector3 LocalPositionOffset() const { return m_current.m_localOffset; }
+            AZ::Vector3 LocalPosition() const
+            {
+                return m_start.m_localPosition + m_current.m_localOffset;
+            }
+            AZ::Vector3 LocalPositionOffset() const
+            {
+                return m_current.m_localOffset;
+            }
         };
 
         using MouseActionCallback = AZStd::function<void(const Action&)>;
@@ -81,39 +87,44 @@ namespace AzToolsFramework
         void SetView(AZStd::unique_ptr<ManipulatorView>&& view);
 
     private:
-        void OnLeftMouseDownImpl(
-            const ViewportInteraction::MouseInteraction& interaction, float rayIntersectionDistance) override;
-        void OnLeftMouseUpImpl(
-            const ViewportInteraction::MouseInteraction& interaction) override;
-        void OnMouseMoveImpl(
-            const ViewportInteraction::MouseInteraction& interaction) override;
+        void OnLeftMouseDownImpl(const ViewportInteraction::MouseInteraction& interaction, float rayIntersectionDistance) override;
+        void OnLeftMouseUpImpl(const ViewportInteraction::MouseInteraction& interaction) override;
+        void OnMouseMoveImpl(const ViewportInteraction::MouseInteraction& interaction) override;
 
         void InvalidateImpl() override;
         void SetBoundsDirtyImpl() override;
 
-        /// Initial data recorded when a press first happens with a surface manipulator.
+        //! Initial data recorded when a press first happens with a surface manipulator.
         struct StartInternal
         {
-            AZ::Vector3 m_localPosition; ///< The current position of the manipulator in local space.
-            AZ::Vector3 m_localHitPosition; ///< The hit position with the terrain in local space.
-            AZ::Vector3 m_snapOffset; ///< The snap offset amount to ensure manipulator is aligned to the grid.
+            AZ::Vector3 m_localPosition; //!< The current position of the manipulator in local space.
+            AZ::Vector3 m_localHitPosition; //!< The hit position with the terrain in local space.
+            AZ::Vector3 m_snapOffset; //!< The snap offset amount to ensure manipulator is aligned to the grid.
         };
 
-        StartInternal m_startInternal; ///< Internal initial state recorded/created in OnMouseDown.
+        StartInternal m_startInternal; //!< Internal initial state recorded/created in OnMouseDown.
 
-        AZStd::unique_ptr<ManipulatorView> m_manipulatorView = nullptr; ///< Look of manipulator.
+        AZStd::unique_ptr<ManipulatorView> m_manipulatorView = nullptr; //!< Look of manipulator.
 
         MouseActionCallback m_onLeftMouseDownCallback = nullptr;
         MouseActionCallback m_onLeftMouseUpCallback = nullptr;
         MouseActionCallback m_onMouseMoveCallback = nullptr;
 
         static StartInternal CalculateManipulationDataStart(
-            const AZ::Transform& worldFromLocal, const AZ::Vector3& worldSurfacePosition,
-            const AZ::Vector3& localPosition, bool snapping, float gridSize, int viewportId);
+            const AZ::Transform& worldFromLocal,
+            const AZ::Vector3& worldSurfacePosition,
+            const AZ::Vector3& localPosition,
+            bool snapping,
+            float gridSize,
+            int viewportId);
 
         static Action CalculateManipulationDataAction(
-            const StartInternal& startInternal, const AZ::Transform& worldFromLocal,
-            const AZ::Vector3& worldSurfacePosition, bool snapping, float gridSize,
-            ViewportInteraction::KeyboardModifiers keyboardModifiers, int viewportId);
+            const StartInternal& startInternal,
+            const AZ::Transform& worldFromLocal,
+            const AZ::Vector3& worldSurfacePosition,
+            bool snapping,
+            float gridSize,
+            ViewportInteraction::KeyboardModifiers keyboardModifiers,
+            int viewportId);
     };
 } // namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/TranslationManipulators.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/TranslationManipulators.cpp
index bfdfd8ba08..57d175c34e 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/TranslationManipulators.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/TranslationManipulators.cpp
@@ -1,14 +1,14 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
 #include "TranslationManipulators.h"
 
@@ -77,8 +77,7 @@ namespace AzToolsFramework
         }
     }
 
-    void TranslationManipulators::InstallLinearManipulatorMouseUpCallback(
-        const LinearManipulator::MouseActionCallback& onMouseUpCallback)
+    void TranslationManipulators::InstallLinearManipulatorMouseUpCallback(const LinearManipulator::MouseActionCallback& onMouseUpCallback)
     {
         for (AZStd::shared_ptr<LinearManipulator>& manipulator : m_linearManipulators)
         {
@@ -104,8 +103,7 @@ namespace AzToolsFramework
         }
     }
 
-    void TranslationManipulators::InstallPlanarManipulatorMouseUpCallback(
-        const PlanarManipulator::MouseActionCallback& onMouseUpCallback)
+    void TranslationManipulators::InstallPlanarManipulatorMouseUpCallback(const PlanarManipulator::MouseActionCallback& onMouseUpCallback)
     {
         for (AZStd::shared_ptr<PlanarManipulator>& manipulator : m_planarManipulators)
         {
@@ -122,8 +120,7 @@ namespace AzToolsFramework
         }
     }
 
-    void TranslationManipulators::InstallSurfaceManipulatorMouseUpCallback(
-        const SurfaceManipulator::MouseActionCallback& onMouseUpCallback)
+    void TranslationManipulators::InstallSurfaceManipulatorMouseUpCallback(const SurfaceManipulator::MouseActionCallback& onMouseUpCallback)
     {
         if (m_surfaceManipulator)
         {
@@ -242,7 +239,9 @@ namespace AzToolsFramework
     }
 
     void TranslationManipulators::ConfigureLinearView(
-        float axisLength, const AZ::Color& axis1Color, const AZ::Color& axis2Color,
+        float axisLength,
+        const AZ::Color& axis1Color,
+        const AZ::Color& axis2Color,
         const AZ::Color& axis3Color /*= AZ::Color(0.0f, 0.0f, 1.0f, 0.5f)*/)
     {
         const float coneLength = 0.28f;
@@ -251,15 +250,13 @@ namespace AzToolsFramework
 
         const AZ::Color axesColor[] = { axis1Color, axis2Color, axis3Color };
 
-        const auto configureLinearView = [lineWidth, coneLength, axisLength, coneRadius](
-            LinearManipulator* linearManipulator, const AZ::Color& color)
+        const auto configureLinearView =
+            [lineWidth, coneLength, axisLength, coneRadius](LinearManipulator* linearManipulator, const AZ::Color& color)
         {
             ManipulatorViews views;
-            views.emplace_back(CreateManipulatorViewLine(
-                *linearManipulator, color, axisLength, lineWidth));
+            views.emplace_back(CreateManipulatorViewLine(*linearManipulator, color, axisLength, lineWidth));
             views.emplace_back(CreateManipulatorViewCone(
-                *linearManipulator, color, linearManipulator->GetAxis() * (axisLength - coneLength),
-                coneLength, coneRadius));
+                *linearManipulator, color, linearManipulator->GetAxis() * (axisLength - coneLength), coneLength, coneRadius));
             linearManipulator->SetViews(AZStd::move(views));
         };
 
@@ -270,7 +267,8 @@ namespace AzToolsFramework
     }
 
     void TranslationManipulators::ConfigurePlanarView(
-        const AZ::Color& plane1Color, const AZ::Color& plane2Color /*= AZ::Color(0.0f, 1.0f, 0.0f, 0.5f)*/,
+        const AZ::Color& plane1Color,
+        const AZ::Color& plane2Color /*= AZ::Color(0.0f, 1.0f, 0.0f, 0.5f)*/,
         const AZ::Color& plane3Color /*= AZ::Color(0.0f, 0.0f, 1.0f, 0.5f)*/)
     {
         const float planeSize = 0.6f;
@@ -278,34 +276,29 @@ namespace AzToolsFramework
 
         for (size_t manipulatorIndex = 0; manipulatorIndex < m_planarManipulators.size(); ++manipulatorIndex)
         {
-            const AZStd::shared_ptr<ManipulatorViewQuad> manipulatorView =
-                CreateManipulatorViewQuad(
-                    *m_planarManipulators[manipulatorIndex], planesColor[manipulatorIndex],
-                    planesColor[(manipulatorIndex + 1) % 3],
-                    planeSize);
+            const AZStd::shared_ptr<ManipulatorViewQuad> manipulatorView = CreateManipulatorViewQuad(
+                *m_planarManipulators[manipulatorIndex], planesColor[manipulatorIndex], planesColor[(manipulatorIndex + 1) % 3], planeSize);
 
-            m_planarManipulators[manipulatorIndex]->SetViews(ManipulatorViews{manipulatorView});
+            m_planarManipulators[manipulatorIndex]->SetViews(ManipulatorViews{ manipulatorView });
         }
     }
 
-    void TranslationManipulators::ConfigureSurfaceView(
-        const float radius, const AZ::Color& color)
+    void TranslationManipulators::ConfigureSurfaceView(const float radius, const AZ::Color& color)
     {
         if (m_surfaceManipulator)
         {
-            m_surfaceManipulator->SetView(CreateManipulatorViewSphere(color, radius,
-                [](const ViewportInteraction::MouseInteraction& /*mouseInteraction*/,
-                    bool mouseOver, const AZ::Color& defaultColor) -> AZ::Color
-            {
-                const AZ::Color color[2] =
+            m_surfaceManipulator->SetView(CreateManipulatorViewSphere(
+                color, radius,
+                [](const ViewportInteraction::MouseInteraction& /*mouseInteraction*/, bool mouseOver,
+                   const AZ::Color& defaultColor) -> AZ::Color
                 {
-                    defaultColor,
-                    Vector3ToVector4(
-                        BaseManipulator::s_defaultMouseOverColor.GetAsVector3(), s_surfaceManipulatorTransparency)
-                };
+                    const AZ::Color color[2] = {
+                        defaultColor,
+                        Vector3ToVector4(BaseManipulator::s_defaultMouseOverColor.GetAsVector3(), s_surfaceManipulatorTransparency)
+                    };
 
-                return color[mouseOver];
-            }));
+                    return color[mouseOver];
+                }));
         }
     }
 
@@ -327,27 +320,17 @@ namespace AzToolsFramework
         }
     }
 
-    void ConfigureTranslationManipulatorAppearance3d(
-        TranslationManipulators* translationManipulators)
+    void ConfigureTranslationManipulatorAppearance3d(TranslationManipulators* translationManipulators)
     {
-        translationManipulators->SetAxes(
-            AZ::Vector3::CreateAxisX(),
-            AZ::Vector3::CreateAxisY(),
-            AZ::Vector3::CreateAxisZ());
-        translationManipulators->ConfigurePlanarView(
-            s_xAxisColor, s_yAxisColor, s_zAxisColor);
-        translationManipulators->ConfigureLinearView(
-            s_axisLength, s_xAxisColor, s_yAxisColor, s_zAxisColor);
-        translationManipulators->ConfigureSurfaceView(
-            s_surfaceManipulatorRadius, s_surfaceManipulatorColor);
+        translationManipulators->SetAxes(AZ::Vector3::CreateAxisX(), AZ::Vector3::CreateAxisY(), AZ::Vector3::CreateAxisZ());
+        translationManipulators->ConfigurePlanarView(s_xAxisColor, s_yAxisColor, s_zAxisColor);
+        translationManipulators->ConfigureLinearView(s_axisLength, s_xAxisColor, s_yAxisColor, s_zAxisColor);
+        translationManipulators->ConfigureSurfaceView(s_surfaceManipulatorRadius, s_surfaceManipulatorColor);
     }
 
-    void ConfigureTranslationManipulatorAppearance2d(
-        TranslationManipulators* translationManipulators)
+    void ConfigureTranslationManipulatorAppearance2d(TranslationManipulators* translationManipulators)
     {
-        translationManipulators->SetAxes(
-            AZ::Vector3::CreateAxisX(),
-            AZ::Vector3::CreateAxisY());
+        translationManipulators->SetAxes(AZ::Vector3::CreateAxisX(), AZ::Vector3::CreateAxisY());
         translationManipulators->ConfigurePlanarView(s_xAxisColor);
         translationManipulators->ConfigureLinearView(s_axisLength, s_xAxisColor, s_yAxisColor);
     }
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/TranslationManipulators.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/TranslationManipulators.h
index 0e7d3108aa..5f5f1a71e3 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/TranslationManipulators.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/TranslationManipulators.h
@@ -1,14 +1,14 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
 #pragma once
 
@@ -19,16 +19,15 @@
 
 namespace AzToolsFramework
 {
-    /// TranslationManipulators is an aggregation of 3 linear manipulators, 3 planar manipulators
-    /// and one surface manipulator who share the same transform.
-    class TranslationManipulators
-        : public Manipulators
+    //! TranslationManipulators is an aggregation of 3 linear manipulators, 3 planar manipulators
+    //! and one surface manipulator who share the same transform.
+    class TranslationManipulators : public Manipulators
     {
     public:
         AZ_RTTI(TranslationManipulators, "{D5E49EA2-30E0-42BC-A51D-6A7F87818260}")
         AZ_CLASS_ALLOCATOR(TranslationManipulators, AZ::SystemAllocator, 0)
 
-        /// How many dimensions does this translation manipulator have
+        //! How many dimensions does this translation manipulator have.
         enum class Dimensions
         {
             Two,
@@ -55,9 +54,7 @@ namespace AzToolsFramework
         void SetLocalOrientationImpl(const AZ::Quaternion& localOrientation) override;
         void SetNonUniformScaleImpl(const AZ::Vector3& nonUniformScale) override;
 
-        void SetAxes(
-            const AZ::Vector3& axis1, const AZ::Vector3& axis2,
-            const AZ::Vector3& axis3 = AZ::Vector3::CreateAxisZ());
+        void SetAxes(const AZ::Vector3& axis1, const AZ::Vector3& axis2, const AZ::Vector3& axis3 = AZ::Vector3::CreateAxisZ());
 
         void ConfigurePlanarView(
             const AZ::Color& plane1Color,
@@ -66,11 +63,11 @@ namespace AzToolsFramework
 
         void ConfigureLinearView(
             float axisLength,
-            const AZ::Color& axis1Color, const AZ::Color& axis2Color,
+            const AZ::Color& axis1Color,
+            const AZ::Color& axis2Color,
             const AZ::Color& axis3Color = AZ::Color(0.0f, 0.0f, 1.0f, 0.5f));
 
-        void ConfigureSurfaceView(
-            float radius, const AZ::Color& color);
+        void ConfigureSurfaceView(float radius, const AZ::Color& color);
 
     private:
         AZ_DISABLE_COPY_MOVE(TranslationManipulators)
@@ -78,37 +75,43 @@ namespace AzToolsFramework
         // Manipulators
         void ProcessManipulators(const AZStd::function<void(BaseManipulator*)>&) override;
 
-        const Dimensions m_dimensions; ///< How many dimensions of freedom does this manipulator have.
+        const Dimensions m_dimensions; //!< How many dimensions of freedom does this manipulator have.
 
         AZStd::vector<AZStd::shared_ptr<LinearManipulator>> m_linearManipulators;
         AZStd::vector<AZStd::shared_ptr<PlanarManipulator>> m_planarManipulators;
         AZStd::shared_ptr<SurfaceManipulator> m_surfaceManipulator = nullptr;
     };
 
-    /// IndexedTranslationManipulator wraps a standard TranslationManipulators and allows it to be linked
-    /// to a particular index in a list of vertices/points.
+    //! IndexedTranslationManipulator wraps a standard TranslationManipulators and allows it to be linked
+    //! to a particular index in a list of vertices/points.
     template<typename Vertex>
     struct IndexedTranslationManipulator
     {
         explicit IndexedTranslationManipulator(
-            TranslationManipulators::Dimensions dimensions, AZ::u64 vertIndex,
-            const Vertex& position, const AZ::Transform& worldFromLocal, const AZ::Vector3& nonUniformScale)
-                : m_manipulator(dimensions, worldFromLocal, nonUniformScale)
+            TranslationManipulators::Dimensions dimensions,
+            AZ::u64 vertIndex,
+            const Vertex& position,
+            const AZ::Transform& worldFromLocal,
+            const AZ::Vector3& nonUniformScale)
+            : m_manipulator(dimensions, worldFromLocal, nonUniformScale)
         {
             m_vertices.push_back({ position, Vertex::CreateZero(), vertIndex });
         }
 
-        /// Store vertex start position as manipulator event occurs, index refers to location in container.
+        //! Store vertex start position as manipulator event occurs, index refers to location in container.
         struct VertexLookup
         {
             Vertex m_start;
             Vertex m_offset;
             AZ::u64 m_index;
 
-            Vertex CurrentPosition() const { return m_start + m_offset; }
+            Vertex CurrentPosition() const
+            {
+                return m_start + m_offset;
+            }
         };
 
-        /// Helper to iterate over all vertices stored by the manipulator.
+        //! Helper to iterate over all vertices stored by the manipulator.
         void Process(AZStd::function<void(VertexLookup&)> fn)
         {
             for (VertexLookup& vertex : m_vertices)
@@ -117,16 +120,14 @@ namespace AzToolsFramework
             }
         }
 
-        AZStd::vector<VertexLookup> m_vertices; ///< List of vertices currently associated with this translation manipulator.
+        AZStd::vector<VertexLookup> m_vertices; //!< List of vertices currently associated with this translation manipulator.
         TranslationManipulators m_manipulator;
     };
 
-    /// Function pointer to configure how a translation manipulator should look and behave (dimensions/axes/views).
-    using TranslationManipulatorConfiguratorFn = void(*)(TranslationManipulators*);
+    //! Function pointer to configure how a translation manipulator should look and behave (dimensions/axes/views).
+    using TranslationManipulatorConfiguratorFn = void (*)(TranslationManipulators*);
 
-    void ConfigureTranslationManipulatorAppearance3d(
-        TranslationManipulators* translationManipulators);
-    void ConfigureTranslationManipulatorAppearance2d(
-        TranslationManipulators* translationManipulators);
+    void ConfigureTranslationManipulatorAppearance3d(TranslationManipulators* translationManipulators);
+    void ConfigureTranslationManipulatorAppearance2d(TranslationManipulators* translationManipulators);
 
 } // namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Picking/BoundInterface.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Picking/BoundInterface.h
index 3b579e889e..e8e822ca32 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Picking/BoundInterface.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Picking/BoundInterface.h
@@ -1,14 +1,15 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
+
 #pragma once
 
 #include <AzCore/Math/Vector3.h>
@@ -16,30 +17,44 @@
 
 namespace AzToolsFramework
 {
-    /**
-     * Provide unique type alias for AZ::u64 for manipulator, bounds and manager.
-     */
+    //! Provide unique type alias for AZ::u64 for manipulator, bounds and manager.
     template<typename T>
     class IdType
     {
     public:
         explicit IdType(AZ::u64 id = 0)
-            : m_id(id) {}
-        operator AZ::u64() const { return m_id; }
+            : m_id(id)
+        {
+        }
+
+        operator AZ::u64() const
+        {
+            return m_id;
+        }
+
+        bool operator==(IdType other) const
+        {
+            return m_id == other.m_id;
+        }
+
+        bool operator!=(IdType other) const
+        {
+            return m_id != other.m_id;
+        }
 
-        bool operator==(IdType other) const { return m_id == other.m_id; }
-        bool operator!=(IdType other) const { return m_id != other.m_id; }
         IdType& operator++() // pre-increment
         {
             ++m_id;
             return *this;
         }
+
         IdType operator++(int) // post-increment
         {
             IdType temp = *this;
             ++*this;
             return temp;
         }
+
     private:
         AZ::u64 m_id;
     };
@@ -51,10 +66,8 @@ namespace AzToolsFramework
         using RegisteredBoundId = IdType<struct RegisteredBoundType>;
         static const RegisteredBoundId InvalidBoundId = RegisteredBoundId(0);
 
-        /**
-         * This class serves as the base class for the actual bound shapes that various DefaultContextBoundManager-derived
-         * classes return from the function CreateShape.
-         */
+        //! This class serves as the base class for the actual bound shapes that various DefaultContextBoundManager-derived
+        //! classes return from the function CreateShape.
         class BoundShapeInterface
         {
         public:
@@ -63,25 +76,33 @@ namespace AzToolsFramework
             explicit BoundShapeInterface(const RegisteredBoundId boundId)
                 : m_boundId(boundId)
                 , m_valid(false)
-            {}
+            {
+            }
 
             virtual ~BoundShapeInterface() = default;
 
-            RegisteredBoundId GetBoundId() const { return m_boundId; }
+            RegisteredBoundId GetBoundId() const
+            {
+                return m_boundId;
+            }
 
-            /**
-             * @param rayOrigin The origin of the ray to test with.
-             * @param rayDir The direction of the ray to test with.
-             * @param[out] rayIntersectionDistance The distance of the intersecting point closest to the ray origin.
-             * @return Boolean indicating whether there is a least one intersecting point between this bound shape and the ray.
-             */
-            virtual bool IntersectRay(
-                const AZ::Vector3& rayOrigin, const AZ::Vector3& rayDir, float& rayIntersectionDistance) = 0;
+            //! @param rayOrigin The origin of the ray to test with.
+            //! @param rayDir The direction of the ray to test with.
+            //! @param[out] rayIntersectionDistance The distance of the intersecting point closest to the ray origin.
+            //! @return Boolean indicating whether there is a least one intersecting point between this bound shape and the ray.
+            virtual bool IntersectRay(const AZ::Vector3& rayOrigin, const AZ::Vector3& rayDir, float& rayIntersectionDistance) = 0;
 
             virtual void SetShapeData(const BoundRequestShapeBase& shapeData) = 0;
 
-            void SetValidity(bool valid) { m_valid = valid; }
-            bool IsValid() const { return m_valid; }
+            void SetValidity(bool valid)
+            {
+                m_valid = valid;
+            }
+
+            bool IsValid() const
+            {
+                return m_valid;
+            }
 
         private:
             RegisteredBoundId m_boundId;
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Picking/ContextBoundAPI.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Picking/ContextBoundAPI.h
index 4a053ea758..7127ac82ee 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Picking/ContextBoundAPI.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Picking/ContextBoundAPI.h
@@ -1,22 +1,22 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
 #pragma once
 
 #include <AzCore/EBus/EBus.h>
-#include <AzCore/Math/Vector3.h>
 #include <AzCore/Math/Quaternion.h>
 #include <AzCore/Math/Spline.h>
 #include <AzCore/Math/Transform.h>
+#include <AzCore/Math/Vector3.h>
 #include <AzCore/Memory/SystemAllocator.h>
 #include <AzCore/RTTI/RTTI.h>
 #include <AzCore/std/smart_ptr/make_shared.h>
@@ -27,9 +27,7 @@ namespace AzToolsFramework
 {
     namespace Picking
     {
-        /**
-         * An interface concrete shape types can implement to create specific BoundShapeInterfaces.
-         */
+        //! An interface concrete shape types can implement to create specific BoundShapeInterfaces.
         class BoundRequestShapeBase
         {
         public:
@@ -114,11 +112,9 @@ namespace AzToolsFramework
             float m_radius;
         };
 
-        /**
-         * The quad shape consists of 4 points in 3D space. Please set them from \ref m_corner1 to \ref m_corner4
-         * in either clock-wise winding or counter clock-wise winding. In another word, \ref m_corner1 and
-         * \ref corner_2 cannot be diagonal corners.
-         */
+        //! The quad shape consists of 4 points in 3D space. Please set them from \ref m_corner1 to \ref m_corner4
+        //! in either clock-wise winding or counter clock-wise winding. In another word, \ref m_corner1 and
+        //! \ref corner_2 cannot be diagonal corners.
         class BoundShapeQuad : public BoundRequestShapeBase
         {
         public:
@@ -138,9 +134,7 @@ namespace AzToolsFramework
             AZ::Vector3 m_corner4;
         };
 
-        /**
-         * The line segment consists of two points in 3D space defining a line the user can interact with.
-         */
+        //! The line segment consists of two points in 3D space defining a line the user can interact with.
         class BoundShapeLineSegment : public BoundRequestShapeBase
         {
         public:
@@ -159,10 +153,8 @@ namespace AzToolsFramework
             float m_width;
         };
 
-        /**
-         * The torus shape is approximated by a cylinder whose radius is the sum of the torus's major radius
-         * and minor radius and height is twice the torus's minor radius.
-         */
+        //! The torus shape is approximated by a cylinder whose radius is the sum of the torus's major radius
+        //! and minor radius and height is twice the torus's minor radius.
         class BoundShapeTorus : public BoundRequestShapeBase
         {
         public:
@@ -182,10 +174,8 @@ namespace AzToolsFramework
             float m_minorRadius;
         };
 
-        /**
-         * The spline is specified by a number of vertices. A piecewise approximation of the curve
-         * is computed by using a number of linear steps (defined by the granularity of the curve).
-         */
+        //! The spline is specified by a number of vertices. A piecewise approximation of the curve
+        //! is computed by using a number of linear steps (defined by the granularity of the curve).
         class BoundShapeSpline : public BoundRequestShapeBase
         {
         public:
@@ -204,16 +194,14 @@ namespace AzToolsFramework
             float m_width;
         };
 
-        /**
-         * Ray query for intersection against bounds.
-         */
+        //! Ray query for intersection against bounds.
         struct RaySelectInfo
         {
-            AZ::Vector3 m_origin; ///< Start of ray.
-            AZ::Vector3 m_direction; ///< Direction of ray - make sure m_direction is unit length.
-            AZStd::vector<AZStd::pair<RegisteredBoundId, float>> m_boundIdsHit; ///< Store the id of the intersected bound
-                                                                                ///< and the parameter of the corresponding
-                                                                                ///< intersecting point.
+            AZ::Vector3 m_origin; //!< Start of ray.
+            AZ::Vector3 m_direction; //!< Direction of ray - make sure m_direction is unit length.
+            AZStd::vector<AZStd::pair<RegisteredBoundId, float>> m_boundIdsHit; //!< Store the id of the intersected bound
+                                                                                //!< and the parameter of the corresponding
+                                                                                //!< intersecting point.
         };
     } // namespace Picking
 } // namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Picking/Manipulators/ManipulatorBoundManager.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Picking/Manipulators/ManipulatorBoundManager.cpp
index d838413a67..342dc4b99e 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Picking/Manipulators/ManipulatorBoundManager.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Picking/Manipulators/ManipulatorBoundManager.cpp
@@ -1,14 +1,14 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
 #include "ManipulatorBoundManager.h"
 
@@ -16,8 +16,7 @@ namespace AzToolsFramework
 {
     namespace Picking
     {
-        RegisteredBoundId ManipulatorBoundManager::UpdateOrRegisterBound(
-            const BoundRequestShapeBase& shapeData, RegisteredBoundId boundId)
+        RegisteredBoundId ManipulatorBoundManager::UpdateOrRegisterBound(const BoundRequestShapeBase& shapeData, RegisteredBoundId boundId)
         {
             if (boundId == InvalidBoundId)
             {
@@ -25,8 +24,7 @@ namespace AzToolsFramework
                 boundId = m_nextBoundId++;
             }
 
-            if (auto result = m_boundIdToShapeMap.find(boundId);
-                result == m_boundIdToShapeMap.end())
+            if (auto result = m_boundIdToShapeMap.find(boundId); result == m_boundIdToShapeMap.end())
             {
                 if (AZStd::shared_ptr<BoundShapeInterface> createdShape = CreateShape(shapeData, boundId))
                 {
@@ -49,19 +47,16 @@ namespace AzToolsFramework
 
         void ManipulatorBoundManager::UnregisterBound(const RegisteredBoundId boundId)
         {
-            if (const auto findIter = m_boundIdToShapeMap.find(boundId);
-                findIter != m_boundIdToShapeMap.end())
+            if (const auto findIter = m_boundIdToShapeMap.find(boundId); findIter != m_boundIdToShapeMap.end())
             {
                 DeleteShape(findIter->second.get());
                 m_boundIdToShapeMap.erase(findIter);
             }
         }
 
-        void ManipulatorBoundManager::SetBoundValidity(
-            const RegisteredBoundId boundId, const bool valid)
+        void ManipulatorBoundManager::SetBoundValidity(const RegisteredBoundId boundId, const bool valid)
         {
-            if (auto found = m_boundIdToShapeMap.find(boundId);
-                found != m_boundIdToShapeMap.end())
+            if (auto found = m_boundIdToShapeMap.find(boundId); found != m_boundIdToShapeMap.end())
             {
                 found->second->SetValidity(valid);
             }
@@ -104,9 +99,9 @@ namespace AzToolsFramework
                         const auto hitItr = AZStd::lower_bound(
                             rayHits.begin(), rayHits.end(), BoundIdHitDistance(0, t),
                             [](const BoundIdHitDistance& lhs, const BoundIdHitDistance& rhs)
-                        {
-                            return lhs.second < rhs.second;
-                        });
+                            {
+                                return lhs.second < rhs.second;
+                            });
 
                         rayHits.insert(hitItr, AZStd::make_pair(bound->GetBoundId(), t));
                     }
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Picking/Manipulators/ManipulatorBoundManager.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Picking/Manipulators/ManipulatorBoundManager.h
index 78e714c256..504f06bb49 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Picking/Manipulators/ManipulatorBoundManager.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Picking/Manipulators/ManipulatorBoundManager.h
@@ -1,14 +1,14 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
 #pragma once
 
@@ -21,10 +21,8 @@ namespace AzToolsFramework
     {
         class BoundShapeInterface;
 
-        /**
-         * Handle creating, destroying and storing all active manipulator
-         * bounds for performing raycasts/picking against.
-         */
+        //! Handle creating, destroying and storing all active manipulator
+        //! bounds for performing raycasts/picking against.
         class ManipulatorBoundManager
         {
         public:
@@ -35,21 +33,19 @@ namespace AzToolsFramework
             ManipulatorBoundManager& operator=(const ManipulatorBoundManager&) = delete;
             ~ManipulatorBoundManager() = default;
 
-            RegisteredBoundId UpdateOrRegisterBound(
-                const BoundRequestShapeBase& shapeData, RegisteredBoundId id);
+            RegisteredBoundId UpdateOrRegisterBound(const BoundRequestShapeBase& shapeData, RegisteredBoundId id);
             void UnregisterBound(RegisteredBoundId boundId);
             void SetBoundValidity(RegisteredBoundId boundId, bool valid);
-            void RaySelect(RaySelectInfo &rayInfo);
+            void RaySelect(RaySelectInfo& rayInfo);
 
         private:
-            AZStd::shared_ptr<BoundShapeInterface> CreateShape(
-                const BoundRequestShapeBase& ptrShape, RegisteredBoundId id);
+            AZStd::shared_ptr<BoundShapeInterface> CreateShape(const BoundRequestShapeBase& ptrShape, RegisteredBoundId id);
             void DeleteShape(const BoundShapeInterface* boundShape);
 
             AZStd::unordered_map<RegisteredBoundId, AZStd::shared_ptr<BoundShapeInterface>> m_boundIdToShapeMap;
-            AZStd::vector<AZStd::shared_ptr<BoundShapeInterface>> m_bounds; ///< All current manipulator bounds.
+            AZStd::vector<AZStd::shared_ptr<BoundShapeInterface>> m_bounds; //!< All current manipulator bounds.
 
-            RegisteredBoundId m_nextBoundId = RegisteredBoundId(1); ///< Next bound id to use when a bound is registered.
+            RegisteredBoundId m_nextBoundId = RegisteredBoundId(1); //!< Next bound id to use when a bound is registered.
         };
     } // namespace Picking
 } // namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Picking/Manipulators/ManipulatorBounds.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Picking/Manipulators/ManipulatorBounds.cpp
index 8a9ebbacbc..8dca45cc9a 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Picking/Manipulators/ManipulatorBounds.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Picking/Manipulators/ManipulatorBounds.cpp
@@ -1,17 +1,18 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
 #include <AzCore/Math/IntersectSegment.h>
 #include <AzCore/Math/Spline.h>
+#include <AzCore/std/limits.h>
 #include <AzToolsFramework/Picking/ContextBoundAPI.h>
 #include <AzToolsFramework/Picking/Manipulators/ManipulatorBounds.h>
 
@@ -23,8 +24,7 @@ namespace AzToolsFramework
             const AZ::Vector3& rayOrigin, const AZ::Vector3& rayDirection, float& rayIntersectionDistance)
         {
             float vecRayIntersectionDistance;
-            if (AZ::Intersect::IntersectRaySphere(
-                rayOrigin, rayDirection, m_center, m_radius, vecRayIntersectionDistance) > 0)
+            if (AZ::Intersect::IntersectRaySphere(rayOrigin, rayDirection, m_center, m_radius, vecRayIntersectionDistance) > 0)
             {
                 rayIntersectionDistance = vecRayIntersectionDistance;
                 return true;
@@ -45,8 +45,9 @@ namespace AzToolsFramework
         bool ManipulatorBoundBox::IntersectRay(
             const AZ::Vector3& rayOrigin, const AZ::Vector3& rayDirection, float& rayIntersectionDistance)
         {
-            return AZ::Intersect::IntersectRayBox(rayOrigin, rayDirection, m_center, m_axis1, m_axis2, m_axis3,
-                m_halfExtents.GetX(), m_halfExtents.GetY(), m_halfExtents.GetZ(), rayIntersectionDistance) > 0;
+            return AZ::Intersect::IntersectRayBox(
+                       rayOrigin, rayDirection, m_center, m_axis1, m_axis2, m_axis3, m_halfExtents.GetX(), m_halfExtents.GetY(),
+                       m_halfExtents.GetZ(), rayIntersectionDistance) > 0;
         }
 
         void ManipulatorBoundBox::SetShapeData(const BoundRequestShapeBase& shapeData)
@@ -66,8 +67,7 @@ namespace AzToolsFramework
         {
             float t1 = std::numeric_limits<float>::max();
             float t2 = std::numeric_limits<float>::max();
-            if (AZ::Intersect::IntersectRayCappedCylinder(
-                rayOrigin, rayDirection, m_base, m_axis, m_height, m_radius, t1, t2) > 0)
+            if (AZ::Intersect::IntersectRayCappedCylinder(rayOrigin, rayDirection, m_base, m_axis, m_height, m_radius, t1, t2) > 0)
             {
                 rayIntersectionDistance = AZStd::GetMin(t1, t2);
                 return true;
@@ -92,8 +92,7 @@ namespace AzToolsFramework
         {
             float t1 = std::numeric_limits<float>::max();
             float t2 = std::numeric_limits<float>::max();
-            if (AZ::Intersect::IntersectRayCone(
-                rayOrigin, rayDirection, m_apexPosition, m_dir, m_height, m_radius, t1, t2) > 0)
+            if (AZ::Intersect::IntersectRayCone(rayOrigin, rayDirection, m_apexPosition, m_dir, m_height, m_radius, t1, t2) > 0)
             {
                 rayIntersectionDistance = AZStd::GetMin(t1, t2);
                 return true;
@@ -117,7 +116,7 @@ namespace AzToolsFramework
             const AZ::Vector3& rayOrigin, const AZ::Vector3& rayDirection, float& rayIntersectionDistance)
         {
             return AZ::Intersect::IntersectRayQuad(
-                rayOrigin, rayDirection, m_corner1, m_corner2, m_corner3, m_corner4, rayIntersectionDistance) > 0;
+                       rayOrigin, rayDirection, m_corner1, m_corner2, m_corner3, m_corner4, rayIntersectionDistance) > 0;
         }
 
         void ManipulatorBoundQuad::SetShapeData(const BoundRequestShapeBase& shapeData)
@@ -157,8 +156,7 @@ namespace AzToolsFramework
             float rayProportion, lineSegmentProportion;
             // note: here out param is proportion/percentage of line
             AZ::Intersect::ClosestSegmentSegment(
-                rayOrigin, rayOrigin + rayDirection * rayLength,
-                m_worldStart, m_worldEnd, rayProportion, lineSegmentProportion,
+                rayOrigin, rayOrigin + rayDirection * rayLength, m_worldStart, m_worldEnd, rayProportion, lineSegmentProportion,
                 closestPosRay, closestPosLineSegment);
 
             float distanceFromLine = (closestPosRay - closestPosLineSegment).GetLength();
@@ -188,8 +186,7 @@ namespace AzToolsFramework
         {
             if (const AZStd::shared_ptr<const AZ::Spline> spline = m_spline.lock())
             {
-                AZ::RaySplineQueryResult splineQueryResult =
-                    AZ::IntersectSpline(m_transform, rayOrigin, rayDirection, *spline);
+                AZ::RaySplineQueryResult splineQueryResult = AZ::IntersectSpline(m_transform, rayOrigin, rayDirection, *spline);
 
                 if (splineQueryResult.m_distanceSq <= m_width * m_width)
                 {
@@ -214,22 +211,25 @@ namespace AzToolsFramework
         }
 
         bool IntersectHollowCylinder(
-            const AZ::Vector3& rayOrigin, const AZ::Vector3& rayDirection,
-            const AZ::Vector3& center, const AZ::Vector3& axis,
-            const float minorRadius, const float majorRadius,
+            const AZ::Vector3& rayOrigin,
+            const AZ::Vector3& rayDirection,
+            const AZ::Vector3& center,
+            const AZ::Vector3& axis,
+            const float minorRadius,
+            const float majorRadius,
             float& rayIntersectionDistance)
         {
-            float t1 = std::numeric_limits<float>::max();
-            float t2 = std::numeric_limits<float>::max();
+            float t1 = AZStd::numeric_limits<float>::max();
+            float t2 = AZStd::numeric_limits<float>::max();
             const AZ::Vector3 base = center - axis * minorRadius;
 
             if (AZ::Intersect::IntersectRayCappedCylinder(
-                rayOrigin, rayDirection, base, axis, minorRadius * 2.0f, majorRadius + minorRadius, t1, t2) > 0)
+                    rayOrigin, rayDirection, base, axis, minorRadius * 2.0f, majorRadius + minorRadius, t1, t2) > 0)
             {
-                const float thresholdSq = powf(majorRadius - minorRadius, 2.0f);
+                const float threshold = majorRadius - minorRadius;
+                const float thresholdSq = threshold * threshold;
                 // util lambda used for distance checks at both 't' values
-                const auto validHolowCylinderHit =
-                    [&rayOrigin, &rayDirection, &center, thresholdSq](const float t)
+                const auto validHolowCylinderHit = [&rayOrigin, &rayDirection, &center, thresholdSq](const float t)
                 {
                     // only return a valid intersection if the hit was
                     // not in the 'hollow' part of the cylinder
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Picking/Manipulators/ManipulatorBounds.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Picking/Manipulators/ManipulatorBounds.h
index ca9eeded11..d72e11fd0a 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Picking/Manipulators/ManipulatorBounds.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Picking/Manipulators/ManipulatorBounds.h
@@ -1,14 +1,14 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
 #pragma once
 
@@ -27,36 +27,36 @@ namespace AzToolsFramework
 {
     namespace Picking
     {
-        class ManipulatorBoundSphere
-            : public BoundShapeInterface
+        class ManipulatorBoundSphere : public BoundShapeInterface
         {
         public:
             AZ_RTTI(ManipulatorBoundSphere, "{64D1B863-F574-4B31-A4F2-C9744D8567B3}", BoundShapeInterface);
             AZ_CLASS_ALLOCATOR(ManipulatorBoundSphere, AZ::SystemAllocator, 0);
 
             explicit ManipulatorBoundSphere(RegisteredBoundId boundId)
-                : BoundShapeInterface(boundId) {}
+                : BoundShapeInterface(boundId)
+            {
+            }
 
-            bool IntersectRay(
-                const AZ::Vector3& rayOrigin, const AZ::Vector3& rayDir, float& rayIntersectionDistance) override;
+            bool IntersectRay(const AZ::Vector3& rayOrigin, const AZ::Vector3& rayDir, float& rayIntersectionDistance) override;
             void SetShapeData(const BoundRequestShapeBase& shapeData) override;
 
             AZ::Vector3 m_center = AZ::Vector3::CreateZero();
             float m_radius = 0.0f;
         };
 
-        class ManipulatorBoundBox
-            : public BoundShapeInterface
+        class ManipulatorBoundBox : public BoundShapeInterface
         {
         public:
             AZ_RTTI(ManipulatorBoundBox, "{3AD46067-933F-49B4-82E1-DBF12C7BC02E}", BoundShapeInterface);
             AZ_CLASS_ALLOCATOR(ManipulatorBoundBox, AZ::SystemAllocator, 0);
 
             explicit ManipulatorBoundBox(RegisteredBoundId boundId)
-                : BoundShapeInterface(boundId) {}
+                : BoundShapeInterface(boundId)
+            {
+            }
 
-            bool IntersectRay(
-                const AZ::Vector3& rayOrigin, const AZ::Vector3& rayDir, float& rayIntersectionDistance) override;
+            bool IntersectRay(const AZ::Vector3& rayOrigin, const AZ::Vector3& rayDir, float& rayIntersectionDistance) override;
             void SetShapeData(const BoundRequestShapeBase& shapeData) override;
 
             AZ::Vector3 m_center = AZ::Vector3::CreateZero();
@@ -66,38 +66,38 @@ namespace AzToolsFramework
             AZ::Vector3 m_halfExtents = AZ::Vector3::CreateZero();
         };
 
-        class ManipulatorBoundCylinder
-            : public BoundShapeInterface
+        class ManipulatorBoundCylinder : public BoundShapeInterface
         {
         public:
             AZ_RTTI(ManipulatorBoundCylinder, "{D248F9E4-22E6-41A8-898D-704DF307B533}", BoundShapeInterface);
             AZ_CLASS_ALLOCATOR(ManipulatorBoundCylinder, AZ::SystemAllocator, 0);
 
             explicit ManipulatorBoundCylinder(RegisteredBoundId boundId)
-                : BoundShapeInterface(boundId) {}
+                : BoundShapeInterface(boundId)
+            {
+            }
 
-            bool IntersectRay(
-                const AZ::Vector3& rayOrigin, const AZ::Vector3& rayDir, float& rayIntersectionDistance) override;
+            bool IntersectRay(const AZ::Vector3& rayOrigin, const AZ::Vector3& rayDir, float& rayIntersectionDistance) override;
             void SetShapeData(const BoundRequestShapeBase& shapeData) override;
 
-            AZ::Vector3 m_base = AZ::Vector3::CreateZero(); ///< The center of the circle at the base of the cylinder.
+            AZ::Vector3 m_base = AZ::Vector3::CreateZero(); //!< The center of the circle at the base of the cylinder.
             AZ::Vector3 m_axis = AZ::Vector3::CreateZero();
             float m_height = 0.0f;
             float m_radius = 0.0f;
         };
 
-        class ManipulatorBoundCone
-            : public BoundShapeInterface
+        class ManipulatorBoundCone : public BoundShapeInterface
         {
         public:
             AZ_RTTI(ManipulatorBoundCone, "{9430440D-DFF2-4A60-9073-507C4E9DD65D}", BoundShapeInterface);
             AZ_CLASS_ALLOCATOR(ManipulatorBoundCone, AZ::SystemAllocator, 0);
 
             explicit ManipulatorBoundCone(RegisteredBoundId boundId)
-                : BoundShapeInterface(boundId) {}
+                : BoundShapeInterface(boundId)
+            {
+            }
 
-            bool IntersectRay(
-                const AZ::Vector3& rayOrigin, const AZ::Vector3& rayDir, float& rayIntersectionDistance) override;
+            bool IntersectRay(const AZ::Vector3& rayOrigin, const AZ::Vector3& rayDir, float& rayIntersectionDistance) override;
             void SetShapeData(const BoundRequestShapeBase& shapeData) override;
 
             AZ::Vector3 m_apexPosition = AZ::Vector3::CreateZero();
@@ -106,23 +106,21 @@ namespace AzToolsFramework
             float m_height = 0.0f;
         };
 
-        /**
-         * The quad shape consists of 4 points in 3D space. Please set them from \ref m_corner1 to \ref m_corner4
-         * in either clock-wise winding or counter clock-wise winding. In another word, \ref m_corner1 and
-         * \ref corner_2 cannot be diagonal corners.
-         */
-        class ManipulatorBoundQuad
-            : public BoundShapeInterface
+        //! The quad shape consists of 4 points in 3D space. Please set them from \ref m_corner1 to \ref m_corner4
+        //! in either clock-wise winding or counter clock-wise winding. In another word, \ref m_corner1 and
+        //! \ref corner_2 cannot be diagonal corners.
+        class ManipulatorBoundQuad : public BoundShapeInterface
         {
         public:
             AZ_RTTI(ManipulatorBoundQuad, "{3CDED61C-5786-4299-B5F2-5970DE4457AD}", BoundShapeInterface);
             AZ_CLASS_ALLOCATOR(ManipulatorBoundQuad, AZ::SystemAllocator, 0);
 
             explicit ManipulatorBoundQuad(RegisteredBoundId boundId)
-                : BoundShapeInterface(boundId) {}
+                : BoundShapeInterface(boundId)
+            {
+            }
 
-            bool IntersectRay(
-                const AZ::Vector3& rayOrigin, const AZ::Vector3& rayDir, float& rayIntersectionDistance) override;
+            bool IntersectRay(const AZ::Vector3& rayOrigin, const AZ::Vector3& rayDir, float& rayIntersectionDistance) override;
             void SetShapeData(const BoundRequestShapeBase& shapeData) override;
 
             AZ::Vector3 m_corner1 = AZ::Vector3::CreateZero();
@@ -131,18 +129,18 @@ namespace AzToolsFramework
             AZ::Vector3 m_corner4 = AZ::Vector3::CreateZero();
         };
 
-        class ManipulatorBoundTorus
-            : public BoundShapeInterface
+        class ManipulatorBoundTorus : public BoundShapeInterface
         {
         public:
             AZ_RTTI(ManipulatorBoundTorus, "{46E4711C-178A-4F97-BC14-A048D096E7A1}", BoundShapeInterface);
             AZ_CLASS_ALLOCATOR(ManipulatorBoundTorus, AZ::SystemAllocator, 0);
 
             explicit ManipulatorBoundTorus(RegisteredBoundId boundId)
-                : BoundShapeInterface(boundId) {}
+                : BoundShapeInterface(boundId)
+            {
+            }
 
-            bool IntersectRay(
-                const AZ::Vector3& rayOrigin, const AZ::Vector3& rayDir, float& rayIntersectionDistance) override;
+            bool IntersectRay(const AZ::Vector3& rayOrigin, const AZ::Vector3& rayDir, float& rayIntersectionDistance) override;
             void SetShapeData(const BoundRequestShapeBase& shapeData) override;
 
             // Approximate a torus as a thin cylinder. A ray intersects a torus when the ray and the torus'
@@ -150,22 +148,22 @@ namespace AzToolsFramework
             // center of the torus.
             AZ::Vector3 m_center = AZ::Vector3::CreateZero();
             AZ::Vector3 m_axis = AZ::Vector3::CreateZero();
-            float m_majorRadius = 0.0f; ///< Usually denoted as "R", the distance from the center of the tube to the center of the torus.
-            float m_minorRadius = 0.0f; ///< Usually denoted as "r", the radius of the tube.
+            float m_majorRadius = 0.0f; //!< Usually denoted as "R", the distance from the center of the tube to the center of the torus.
+            float m_minorRadius = 0.0f; //!< Usually denoted as "r", the radius of the tube.
         };
 
-        class ManipulatorBoundLineSegment
-            : public BoundShapeInterface
+        class ManipulatorBoundLineSegment : public BoundShapeInterface
         {
         public:
             AZ_RTTI(ManipulatorBoundLineSegment, "{66801554-1C1A-4E79-B1E7-342DFA779D53}", BoundShapeInterface);
             AZ_CLASS_ALLOCATOR(ManipulatorBoundLineSegment, AZ::SystemAllocator, 0);
 
             explicit ManipulatorBoundLineSegment(RegisteredBoundId boundId)
-                : BoundShapeInterface(boundId) {}
+                : BoundShapeInterface(boundId)
+            {
+            }
 
-            bool IntersectRay(
-                const AZ::Vector3& rayOrigin, const AZ::Vector3& rayDir, float& rayIntersectionDistance) override;
+            bool IntersectRay(const AZ::Vector3& rayOrigin, const AZ::Vector3& rayDir, float& rayIntersectionDistance) override;
             void SetShapeData(const BoundRequestShapeBase& shapeData) override;
 
             AZ::Vector3 m_worldStart = AZ::Vector3::CreateZero();
@@ -173,18 +171,18 @@ namespace AzToolsFramework
             float m_width = 0.0f;
         };
 
-        class ManipulatorBoundSpline
-            : public BoundShapeInterface
+        class ManipulatorBoundSpline : public BoundShapeInterface
         {
         public:
             AZ_RTTI(ManipulatorBoundSpline, "{777760FF-8547-45AD-876F-16BA4D9D0584}", BoundShapeInterface);
             AZ_CLASS_ALLOCATOR(ManipulatorBoundSpline, AZ::SystemAllocator, 0);
 
             explicit ManipulatorBoundSpline(RegisteredBoundId boundId)
-                : BoundShapeInterface(boundId) {}
+                : BoundShapeInterface(boundId)
+            {
+            }
 
-            bool IntersectRay(
-                const AZ::Vector3& rayOrigin, const AZ::Vector3& rayDir, float& rayIntersectionDistance) override;
+            bool IntersectRay(const AZ::Vector3& rayOrigin, const AZ::Vector3& rayDir, float& rayIntersectionDistance) override;
             void SetShapeData(const BoundRequestShapeBase& shapeData) override;
 
             AZStd::weak_ptr<const AZ::Spline> m_spline;
@@ -192,11 +190,14 @@ namespace AzToolsFramework
             float m_width = 0.0f;
         };
 
-        /// Approximate intersection with a torus-like shape.
+        //! Approximate intersection with a torus-like shape.
         bool IntersectHollowCylinder(
-            const AZ::Vector3& rayOrigin, const AZ::Vector3& rayDirection,
-            const AZ::Vector3& center, const AZ::Vector3& axis,
-            float minorRadius, float majorRadius,
+            const AZ::Vector3& rayOrigin,
+            const AZ::Vector3& rayDirection,
+            const AZ::Vector3& center,
+            const AZ::Vector3& axis,
+            float minorRadius,
+            float majorRadius,
             float& rayIntersectionDistance);
 
     } // namespace Picking
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceToTemplateInterface.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceToTemplateInterface.h
index c2ddbcf24f..c9b4b5acc3 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceToTemplateInterface.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceToTemplateInterface.h
@@ -47,8 +47,13 @@ namespace AzToolsFramework
 
             virtual void AppendEntityAliasToPatchPaths(PrefabDom& providedPatch, const AZ::EntityId& entityId) = 0;
 
-            //! Updates the template links (updating instances) for the given templateId using the providedPatch
-            virtual bool PatchTemplate(PrefabDomValue& providedPatch, TemplateId templateId) = 0;
+            //! Updates the template links (updating instances) for the given template and triggers propagation on its instances.
+            //! @param providedPatch The patch to apply to the template.
+            //! @param templateId The id of the template to update.
+            //! @param instanceToExclude An optional reference to an instance of the template being updated that should not be refreshes as part of propagation.
+            //!     Defaults to nullopt, which means that all instances will be refreshed.
+            //! @return True if the template was patched correctly, false if the operation failed.
+            virtual bool PatchTemplate(PrefabDomValue& providedPatch, TemplateId templateId, InstanceOptionalReference instanceToExclude = AZStd::nullopt) = 0;
 
             virtual void ApplyPatchesToInstance(const AZ::EntityId& entityId, PrefabDom& patches, const Instance& instanceToAddPatches) = 0;
 
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceToTemplatePropagator.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceToTemplatePropagator.cpp
index 6d3ddedd51..9fb6293b74 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceToTemplatePropagator.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceToTemplatePropagator.cpp
@@ -172,7 +172,7 @@ namespace AzToolsFramework
             }
         }
 
-        bool InstanceToTemplatePropagator::PatchTemplate(PrefabDomValue& providedPatch, TemplateId templateId)
+        bool InstanceToTemplatePropagator::PatchTemplate(PrefabDomValue& providedPatch, TemplateId templateId, InstanceOptionalReference instanceToExclude)
         {
             PrefabDom& templateDomReference = m_prefabSystemComponentInterface->FindTemplateDom(templateId);
 
@@ -184,7 +184,7 @@ namespace AzToolsFramework
             if (result.GetOutcome() == AZ::JsonSerializationResult::Outcomes::Success)
             {
                 m_prefabSystemComponentInterface->SetTemplateDirtyFlag(templateId, true);
-                m_prefabSystemComponentInterface->PropagateTemplateChanges(templateId);
+                m_prefabSystemComponentInterface->PropagateTemplateChanges(templateId, instanceToExclude);
                 return true;
             }
             else
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceToTemplatePropagator.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceToTemplatePropagator.h
index 9a6aad8ac1..358494091d 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceToTemplatePropagator.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceToTemplatePropagator.h
@@ -37,7 +37,7 @@ namespace AzToolsFramework
 
             InstanceOptionalReference GetTopMostInstanceInHierarchy(AZ::EntityId entityId);
 
-            bool PatchTemplate(PrefabDomValue& providedPatch, TemplateId templateId) override;
+            bool PatchTemplate(PrefabDomValue& providedPatch, TemplateId templateId, InstanceOptionalReference instanceToExclude = AZStd::nullopt) override;
 
             void ApplyPatchesToInstance(const AZ::EntityId& entityId, PrefabDom& patches, const Instance& instanceToAddPatches) override;
 
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceUpdateExecutor.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceUpdateExecutor.cpp
index 6194adf784..b7a81a7f0c 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceUpdateExecutor.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceUpdateExecutor.cpp
@@ -56,7 +56,7 @@ namespace AzToolsFramework
             AZ::Interface<InstanceUpdateExecutorInterface>::Unregister(this);
         }
 
-        void InstanceUpdateExecutor::AddTemplateInstancesToQueue(TemplateId instanceTemplateId)
+        void InstanceUpdateExecutor::AddTemplateInstancesToQueue(TemplateId instanceTemplateId, InstanceOptionalReference instanceToExclude)
         {
             auto findInstancesResult =
                 m_templateInstanceMapperInterface->FindInstancesOwnedByTemplate(instanceTemplateId);
@@ -70,9 +70,18 @@ namespace AzToolsFramework
                 return;
             }
 
+            Instance* instanceToExcludePtr = nullptr;
+            if (instanceToExclude.has_value())
+            {
+                instanceToExcludePtr = &(instanceToExclude->get());
+            }
+
             for (auto instance : findInstancesResult->get())
             {
-                m_instancesUpdateQueue.emplace_back(instance);
+                if (instance != instanceToExcludePtr)
+                {
+                    m_instancesUpdateQueue.emplace_back(instance);
+                }
             }
         }
 
@@ -103,7 +112,7 @@ namespace AzToolsFramework
 
                     EntityIdList selectedEntityIds;
                     ToolsApplicationRequestBus::BroadcastResult(selectedEntityIds, &ToolsApplicationRequests::GetSelectedEntities);
-                    ToolsApplicationRequestBus::Broadcast(&ToolsApplicationRequests::SetSelectedEntities, EntityIdList());
+                    PrefabDom instanceDomFromRootDocument;
 
                     // Process all instances in the queue, capped to the batch size.
                     // Even though we potentially initialized the batch size to the queue, it's possible for the queue size to shrink
@@ -148,13 +157,62 @@ namespace AzToolsFramework
                             continue;
                         }
 
-                        Template& currentTemplate = currentTemplateReference->get();
                         Instance::EntityList newEntities;
-                        if (PrefabDomUtils::LoadInstanceFromPrefabDom(*instanceToUpdate, newEntities, currentTemplate.GetPrefabDom()))
+
+                        // Climb up to the root of the instance hierarchy from this instance
+                        InstanceOptionalConstReference rootInstance = *instanceToUpdate;
+                        AZStd::vector<InstanceOptionalConstReference> pathOfInstances;
+
+                        while (rootInstance->get().GetParentInstance() != AZStd::nullopt)
                         {
-                            // If a link was created for a nested instance before the changes were propagated,
-                            // then we associate it correctly here
-                            instanceToUpdate->GetNestedInstances([&](AZStd::unique_ptr<Instance>& nestedInstance) {
+                            pathOfInstances.emplace_back(rootInstance);
+                            rootInstance = rootInstance->get().GetParentInstance();
+                        }
+
+                        AZStd::string aliasPathResult = "";
+                        for (auto instanceIter = pathOfInstances.rbegin(); instanceIter != pathOfInstances.rend(); ++instanceIter)
+                        {
+                            aliasPathResult.append("/Instances/");
+                            aliasPathResult.append((*instanceIter)->get().GetInstanceAlias());
+                        }
+
+                        PrefabDomPath rootPrefabDomPath(aliasPathResult.c_str());
+
+                        PrefabDom& rootPrefabTemplateDom =
+                            m_prefabSystemComponentInterface->FindTemplateDom(rootInstance->get().GetTemplateId());
+
+                        auto instanceDomFromRootValue = rootPrefabDomPath.Get(rootPrefabTemplateDom);
+                        if (!instanceDomFromRootValue)
+                        {
+                            AZ_Assert(
+                                false,
+                                "InstanceUpdateExecutor::UpdateTemplateInstancesInQueue - "
+                                "Could not load Instance DOM from the top level ancestor's DOM.");
+
+                            isUpdateSuccessful = false;
+                            continue;
+                        }
+
+                        PrefabDomValueReference instanceDomFromRoot = *instanceDomFromRootValue;
+                        if (!instanceDomFromRoot.has_value())
+                        {
+                            AZ_Assert(
+                                false,
+                                "InstanceUpdateExecutor::UpdateTemplateInstancesInQueue - "
+                                "Could not load Instance DOM from the top level ancestor's DOM.");
+
+                            isUpdateSuccessful = false;
+                            continue;
+                        }
+
+                        // If a link was created for a nested instance before the changes were propagated,
+                        // then we associate it correctly here
+                        instanceDomFromRootDocument.CopyFrom(instanceDomFromRoot->get(), instanceDomFromRootDocument.GetAllocator());
+                        if (PrefabDomUtils::LoadInstanceFromPrefabDom(*instanceToUpdate, newEntities, instanceDomFromRootDocument))
+                        {
+                            Template& currentTemplate = currentTemplateReference->get();
+                            instanceToUpdate->GetNestedInstances([&](AZStd::unique_ptr<Instance>& nestedInstance) 
+                            {
                                 if (nestedInstance->GetLinkId() != InvalidLinkId)
                                 {
                                     return;
@@ -179,22 +237,11 @@ namespace AzToolsFramework
                             AzToolsFramework::EditorEntityContextRequestBus::Broadcast(
                                 &AzToolsFramework::EditorEntityContextRequests::HandleEntitiesAdded, newEntities);
                         }
-                        else
-                        {
-                            AZ_Error(
-                                "Prefab", false,
-                                "InstanceUpdateExecutor::UpdateTemplateInstancesInQueue - "
-                                "Could not load Instance from Prefab DOM of Template with Id '%llu' on file path '%s'.",
-                                currentTemplateId, currentTemplate.GetFilePath().c_str());
-
-                            isUpdateSuccessful = false;
-                        }
                     }
-
                     for (auto entityIdIterator = selectedEntityIds.begin(); entityIdIterator != selectedEntityIds.end(); entityIdIterator++)
                     {
-                        // Since entities get recreated during propagation, we need to check whether the entities correspoding to the list
-                        // of selected entity ids are present or not.
+                        // Since entities get recreated during propagation, we need to check whether the entities
+                        // corresponding to the list of selected entity ids are present or not.
                         AZ::Entity* entity = GetEntityById(*entityIdIterator);
                         if (entity == nullptr)
                         {
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceUpdateExecutor.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceUpdateExecutor.h
index fa13c34b98..a3fdd019c2 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceUpdateExecutor.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceUpdateExecutor.h
@@ -35,7 +35,7 @@ namespace AzToolsFramework
 
             explicit InstanceUpdateExecutor(int instanceCountToUpdateInBatch = 0);
 
-            void AddTemplateInstancesToQueue(TemplateId instanceTemplateId) override;
+            void AddTemplateInstancesToQueue(TemplateId instanceTemplateId, InstanceOptionalReference instanceToExclude = AZStd::nullopt) override;
             bool UpdateTemplateInstancesInQueue() override;
             virtual void RemoveTemplateInstanceFromQueue(const Instance* instance) override;
 
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceUpdateExecutorInterface.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceUpdateExecutorInterface.h
index d794c4929d..2454a995cf 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceUpdateExecutorInterface.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceUpdateExecutorInterface.h
@@ -27,7 +27,7 @@ namespace AzToolsFramework
             virtual ~InstanceUpdateExecutorInterface() = default;
 
             // Add all Instances of Template with given Id into a queue for updating them later.
-            virtual void AddTemplateInstancesToQueue(TemplateId instanceTemplateId) = 0;
+            virtual void AddTemplateInstancesToQueue(TemplateId instanceTemplateId, InstanceOptionalReference instanceToExclude = AZStd::nullopt) = 0;
 
             // Update Instances in the waiting queue.
             virtual bool UpdateTemplateInstancesInQueue() = 0;
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp
index 4656dcf48f..fcdbc5ce07 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp
@@ -242,11 +242,13 @@ namespace AzToolsFramework
                     m_instanceToTemplateInterface->GenerateDomForEntity(containerAfterReset, *containerEntity);
 
                     // Update the state of the entity
-                    PrefabUndoEntityUpdate* state = aznew PrefabUndoEntityUpdate(AZStd::to_string(static_cast<AZ::u64>(containerEntityId)));
-                    state->SetParent(undoBatch.GetUndoBatch());
-                    state->Capture(containerBeforeReset, containerAfterReset, containerEntityId);
+                    auto templateId = instanceToCreate->get().GetTemplateId();
 
-                    state->Redo();
+                    PrefabDom transformPatch;
+                    m_instanceToTemplateInterface->GeneratePatch(transformPatch, containerBeforeReset, containerAfterReset);
+                    m_instanceToTemplateInterface->AppendEntityAliasToPatchPaths(transformPatch, containerEntityId);
+
+                    m_instanceToTemplateInterface->PatchTemplate(transformPatch, templateId);
                 }
 
                 // This clears any entities marked as dirty due to reparenting of entities during the process of creating a prefab.
@@ -661,12 +663,12 @@ namespace AzToolsFramework
                     else
                     {
                         Internal_HandleContainerOverride(
-                            parentUndoBatch, entityId, patch, owningInstance->get().GetLinkId());
+                            parentUndoBatch, entityId, patch, owningInstance->get().GetLinkId(), owningInstance->get().GetParentInstance());
                     }
                 }
                 else
                 {
-                    Internal_HandleEntityChange(parentUndoBatch, entityId, beforeState, afterState);
+                    Internal_HandleEntityChange(parentUndoBatch, entityId, beforeState, afterState, owningInstance);
 
                     if (isNewParentOwnedByDifferentInstance)
                     {
@@ -679,25 +681,27 @@ namespace AzToolsFramework
         }
 
         void PrefabPublicHandler::Internal_HandleContainerOverride(
-            UndoSystem::URSequencePoint* undoBatch, AZ::EntityId entityId, const PrefabDom& patch, const LinkId linkId)
+            UndoSystem::URSequencePoint* undoBatch, AZ::EntityId entityId, const PrefabDom& patch,
+            const LinkId linkId, InstanceOptionalReference parentInstance)
         {
             // Save these changes as patches to the link
             PrefabUndoLinkUpdate* linkUpdate = aznew PrefabUndoLinkUpdate(AZStd::to_string(static_cast<AZ::u64>(entityId)));
             linkUpdate->SetParent(undoBatch);
             linkUpdate->Capture(patch, linkId);
 
-            linkUpdate->Redo();
+            linkUpdate->Redo(parentInstance);
         }
 
         void PrefabPublicHandler::Internal_HandleEntityChange(
-            UndoSystem::URSequencePoint* undoBatch, AZ::EntityId entityId, PrefabDom& beforeState, PrefabDom& afterState)
+            UndoSystem::URSequencePoint* undoBatch, AZ::EntityId entityId, PrefabDom& beforeState,
+            PrefabDom& afterState, InstanceOptionalReference instance)
         {
             // Update the state of the entity
             PrefabUndoEntityUpdate* state = aznew PrefabUndoEntityUpdate(AZStd::to_string(static_cast<AZ::u64>(entityId)));
             state->SetParent(undoBatch);
             state->Capture(beforeState, afterState, entityId);
 
-            state->Redo();
+            state->Redo(instance);
         }
 
         void PrefabPublicHandler::Internal_HandleInstanceChange(
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.h
index 167791d1c1..f3d778d8de 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.h
@@ -162,9 +162,11 @@ namespace AzToolsFramework
                 InstanceOptionalConstReference instance, const AZStd::unordered_set<AZ::IO::Path>& templateSourcePaths);
 
             static void Internal_HandleContainerOverride(
-                UndoSystem::URSequencePoint* undoBatch, AZ::EntityId entityId, const PrefabDom& patch, const LinkId linkId);
+                UndoSystem::URSequencePoint* undoBatch, AZ::EntityId entityId, const PrefabDom& patch,
+                const LinkId linkId, InstanceOptionalReference parentInstance = AZStd::nullopt);
             static void Internal_HandleEntityChange(
-                UndoSystem::URSequencePoint* undoBatch, AZ::EntityId entityId, PrefabDom& beforeState, PrefabDom& afterState);
+                UndoSystem::URSequencePoint* undoBatch, AZ::EntityId entityId, PrefabDom& beforeState,
+                PrefabDom& afterState, InstanceOptionalReference instance = AZStd::nullopt);
             void Internal_HandleInstanceChange(UndoSystem::URSequencePoint* undoBatch, AZ::Entity* entity, AZ::EntityId beforeParentId, AZ::EntityId afterParentId);
 
             void UpdateLinkPatchesWithNewEntityAliases(
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponent.cpp
index 5f5564b4e1..ab77d53283 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponent.cpp
@@ -141,8 +141,10 @@ namespace AzToolsFramework
             return newInstance;
         }
 
-        void PrefabSystemComponent::PropagateTemplateChanges(TemplateId templateId)
+        void PrefabSystemComponent::PropagateTemplateChanges(TemplateId templateId, InstanceOptionalReference instanceToExclude)
         {
+            UpdatePrefabInstances(templateId, instanceToExclude);
+
             auto templateIdToLinkIdsIterator = m_templateToLinkIdsMap.find(templateId);
             if (templateIdToLinkIdsIterator != m_templateToLinkIdsMap.end())
             {
@@ -153,10 +155,6 @@ namespace AzToolsFramework
                     templateIdToLinkIdsIterator->second.end()));
                 UpdateLinkedInstances(linkIdsToUpdateQueue);
             }
-            else
-            {
-                UpdatePrefabInstances(templateId);
-            }
         }
 
         void PrefabSystemComponent::UpdatePrefabTemplate(TemplateId templateId, const PrefabDom& updatedDom)
@@ -174,9 +172,9 @@ namespace AzToolsFramework
             }
         }
 
-        void PrefabSystemComponent::UpdatePrefabInstances(const TemplateId& templateId)
+        void PrefabSystemComponent::UpdatePrefabInstances(const TemplateId& templateId, InstanceOptionalReference instanceToExclude)
         {
-            m_instanceUpdateExecutor.AddTemplateInstancesToQueue(templateId);
+            m_instanceUpdateExecutor.AddTemplateInstancesToQueue(templateId, instanceToExclude);
         }
 
         void PrefabSystemComponent::UpdateLinkedInstances(AZStd::queue<LinkIds>& linkIdsQueue)
@@ -250,8 +248,6 @@ namespace AzToolsFramework
             if (targetTemplateIdToLinkIdMap[targetTemplateId].first.empty() &&
                 targetTemplateIdToLinkIdMap[targetTemplateId].second)
             {
-                UpdatePrefabInstances(targetTemplateId);
-
                 auto templateToLinkIter = m_templateToLinkIdsMap.find(targetTemplateId);
                 if (templateToLinkIter != m_templateToLinkIdsMap.end())
                 {
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponent.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponent.h
index 0a9a450f64..a5170b8eef 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponent.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponent.h
@@ -215,14 +215,14 @@ namespace AzToolsFramework
              */
             void UpdatePrefabTemplate(TemplateId templateId, const PrefabDom& updatedDom) override;
 
-            void PropagateTemplateChanges(TemplateId templateId) override;
+            void PropagateTemplateChanges(TemplateId templateId, InstanceOptionalReference instanceToExclude = AZStd::nullopt) override;
 
             /**
              * Updates all Instances owned by a Template.
              *
              * @param templateId The id of the Template owning Instances to update.
              */
-            void UpdatePrefabInstances(const TemplateId& templateId);
+            void UpdatePrefabInstances(const TemplateId& templateId, InstanceOptionalReference instanceToExclude = AZStd::nullopt);
 
         private:
             AZ_DISABLE_COPY_MOVE(PrefabSystemComponent);
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponentInterface.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponentInterface.h
index f47941254a..8daf4e731b 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponentInterface.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponentInterface.h
@@ -56,7 +56,7 @@ namespace AzToolsFramework
 
             virtual PrefabDom& FindTemplateDom(TemplateId templateId) = 0;
             virtual void UpdatePrefabTemplate(TemplateId templateId, const PrefabDom& updatedDom) = 0;
-            virtual void PropagateTemplateChanges(TemplateId templateId) = 0;
+            virtual void PropagateTemplateChanges(TemplateId templateId, InstanceOptionalReference instanceToExclude = AZStd::nullopt) = 0;
 
             virtual AZStd::unique_ptr<Instance> InstantiatePrefab(AZ::IO::PathView filePath) = 0;
             virtual AZStd::unique_ptr<Instance> InstantiatePrefab(const TemplateId& templateId) = 0;
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabUndo.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabUndo.cpp
index aadcdcdea0..d0b3426495 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabUndo.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabUndo.cpp
@@ -70,10 +70,10 @@ namespace AzToolsFramework
             const AZ::EntityId& entityId)
         {
             //get the entity alias for future undo/redo
-            InstanceOptionalReference instanceOptionalReference = m_instanceEntityMapperInterface->FindOwningInstance(entityId);
-            AZ_Error("Prefab", instanceOptionalReference,
+            auto instanceReference = m_instanceEntityMapperInterface->FindOwningInstance(entityId);
+            AZ_Error("Prefab", instanceReference,
                 "Failed to find an owning instance for the entity with id %llu.", static_cast<AZ::u64>(entityId));
-            Instance& instance = instanceOptionalReference->get();
+            Instance& instance = instanceReference->get();
             m_templateId = instance.GetTemplateId();
             m_entityAlias = (instance.GetEntityAlias(entityId)).value();
 
@@ -106,6 +106,17 @@ namespace AzToolsFramework
                 m_templateId);
         }
 
+        void PrefabUndoEntityUpdate::Redo(InstanceOptionalReference instanceToExclude)
+        {
+            [[maybe_unused]] bool isPatchApplicationSuccessful =
+                m_instanceToTemplateInterface->PatchTemplate(m_redoPatch, m_templateId, instanceToExclude);
+
+            AZ_Error(
+                "Prefab", isPatchApplicationSuccessful,
+                "Applying the patch on the entity with alias '%s' in template with id '%llu' was unsuccessful", m_entityAlias.c_str(),
+                m_templateId);
+        }
+
         //PrefabInstanceLinkUndo
         PrefabUndoInstanceLink::PrefabUndoInstanceLink(const AZStd::string& undoOperationName)
             : PrefabUndoBase(undoOperationName)
@@ -290,7 +301,12 @@ namespace AzToolsFramework
             UpdateLink(m_linkDomNext);
         }
 
-        void PrefabUndoLinkUpdate::UpdateLink(PrefabDom& linkDom)
+        void PrefabUndoLinkUpdate::Redo(InstanceOptionalReference instanceToExclude)
+        {
+            UpdateLink(m_linkDomNext, instanceToExclude);
+        }
+
+        void PrefabUndoLinkUpdate::UpdateLink(PrefabDom& linkDom, InstanceOptionalReference instanceToExclude)
         {
             LinkReference link = m_prefabSystemComponentInterface->FindLink(m_linkId);
 
@@ -304,7 +320,7 @@ namespace AzToolsFramework
 
             //propagate the link changes
             link->get().UpdateTarget();
-            m_prefabSystemComponentInterface->PropagateTemplateChanges(link->get().GetTargetTemplateId());
+            m_prefabSystemComponentInterface->PropagateTemplateChanges(link->get().GetTargetTemplateId(), instanceToExclude);
 
             //mark as dirty
             m_prefabSystemComponentInterface->SetTemplateDirtyFlag(link->get().GetTargetTemplateId(), true);
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabUndo.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabUndo.h
index 33d9e5ad33..7ae677571a 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabUndo.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabUndo.h
@@ -71,11 +71,12 @@ namespace AzToolsFramework
 
             void Capture(
                 PrefabDom& initialState,
-                PrefabDom& endState,
-                const AZ::EntityId& entity);
+                PrefabDom& endState, const AZ::EntityId& entity);
 
             void Undo() override;
             void Redo() override;
+            //! Overload to allow to apply the change, but prevent instanceToExclude from being refreshed.
+            void Redo(InstanceOptionalReference instanceToExclude);
 
         private:
             InstanceEntityMapperInterface* m_instanceEntityMapperInterface = nullptr;
@@ -139,9 +140,11 @@ namespace AzToolsFramework
 
             void Undo() override;
             void Redo() override;
+            //! Overload to allow to apply the change, but prevent instanceToExclude from being refreshed.
+            void Redo(InstanceOptionalReference instanceToExclude);
 
         private:
-            void UpdateLink(PrefabDom& linkDom);
+            void UpdateLink(PrefabDom& linkDom, InstanceOptionalReference instanceToExclude = AZStd::nullopt);
 
             LinkId m_linkId;
             PrefabDom m_linkDomNext;  //data for delete/update
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/EditorContextMenu.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/EditorContextMenu.cpp
index 7fa9724d65..308f0f074f 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/EditorContextMenu.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/EditorContextMenu.cpp
@@ -1,14 +1,14 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
 #include "EditorContextMenu.h"
 
@@ -16,8 +16,7 @@
 
 namespace AzToolsFramework
 {
-    void EditorContextMenuUpdate(
-        EditorContextMenu& contextMenu, const ViewportInteraction::MouseInteractionEvent& mouseInteraction)
+    void EditorContextMenuUpdate(EditorContextMenu& contextMenu, const ViewportInteraction::MouseInteractionEvent& mouseInteraction)
     {
         AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
 
@@ -26,18 +25,17 @@ namespace AzToolsFramework
             mouseInteraction.m_mouseEvent == ViewportInteraction::MouseEvent::Down)
         {
             contextMenu.m_shouldOpen = true;
-            contextMenu.m_clickPoint = ViewportInteraction::QPointFromScreenPoint(
-                mouseInteraction.m_mouseInteraction.m_mousePick.m_screenCoordinates);
+            contextMenu.m_clickPoint =
+                ViewportInteraction::QPointFromScreenPoint(mouseInteraction.m_mouseInteraction.m_mousePick.m_screenCoordinates);
         }
 
         // disable shouldOpen if right clicking an moving the mouse
         if (mouseInteraction.m_mouseEvent == ViewportInteraction::MouseEvent::Move)
         {
-            const QPoint currentScreenCoords = ViewportInteraction::QPointFromScreenPoint(
-                mouseInteraction.m_mouseInteraction.m_mousePick.m_screenCoordinates);
+            const QPoint currentScreenCoords =
+                ViewportInteraction::QPointFromScreenPoint(mouseInteraction.m_mouseInteraction.m_mousePick.m_screenCoordinates);
 
-            contextMenu.m_shouldOpen = contextMenu.m_shouldOpen &&
-                (currentScreenCoords - contextMenu.m_clickPoint).manhattanLength() < 2;
+            contextMenu.m_shouldOpen = contextMenu.m_shouldOpen && (currentScreenCoords - contextMenu.m_clickPoint).manhattanLength() < 2;
         }
 
         // do show the context menu
@@ -58,16 +56,16 @@ namespace AzToolsFramework
                 // Populate global context menu.
                 const int contextMenuFlag = 0;
                 EditorEvents::Bus::BroadcastReverse(
-                    &EditorEvents::PopulateEditorGlobalContextMenu,
-                    contextMenu.m_menu.data(), AzFramework::Vector2FromScreenPoint(
-                        mouseInteraction.m_mouseInteraction.m_mousePick.m_screenCoordinates),
+                    &EditorEvents::PopulateEditorGlobalContextMenu, contextMenu.m_menu.data(),
+                    AzFramework::Vector2FromScreenPoint(mouseInteraction.m_mouseInteraction.m_mousePick.m_screenCoordinates),
                     contextMenuFlag);
 
                 if (!contextMenu.m_menu->isEmpty())
                 {
-                    contextMenu.m_menu->exec(QCursor::pos());
+                    // Use popup instead of exec; this avoids blocking input event processing while the menu dialog is active
+                    contextMenu.m_menu->popup(QCursor::pos());
                 }
             }
         }
     }
-}
+} // namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/EditorContextMenu.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/EditorContextMenu.h
index ebce02fa4c..ff5bffc544 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/EditorContextMenu.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/EditorContextMenu.h
@@ -1,22 +1,22 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
 #pragma once
 
 #include <AzCore/std/smart_ptr/unique_ptr.h>
 
+#include <QMenu>
 #include <QPoint>
 #include <QPointer>
-#include <QMenu>
 
 namespace AzToolsFramework
 {
@@ -25,7 +25,7 @@ namespace AzToolsFramework
         struct MouseInteractionEvent;
     }
 
-    /// State of when and where the right-click context menu should appear.
+    //! State of when and where the right-click context menu should appear.
     struct EditorContextMenu final
     {
         bool m_shouldOpen = false;
@@ -33,8 +33,6 @@ namespace AzToolsFramework
         QPointer<QMenu> m_menu;
     };
 
-    /// Update to run for context menu (when should it appear/disappear etc).
-    void EditorContextMenuUpdate(
-        EditorContextMenu& contextMenu,
-        const ViewportInteraction::MouseInteractionEvent& mouseInteraction);
+    //! Update to run for context menu (when should it appear/disappear etc).
+    void EditorContextMenuUpdate(EditorContextMenu& contextMenu, const ViewportInteraction::MouseInteractionEvent& mouseInteraction);
 } // namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/VertexContainerDisplay.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/VertexContainerDisplay.cpp
index cd9382c497..10016fbb13 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/VertexContainerDisplay.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/VertexContainerDisplay.cpp
@@ -1,14 +1,14 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
 #include "VertexContainerDisplay.h"
 
@@ -23,8 +23,7 @@ namespace AzToolsFramework
         const AZ::Vector3 DefaultVertexTextOffset = AZ::Vector3(0.0f, 0.0f, -0.1f);
 
         void DisplayVertexContainerIndex(
-            AzFramework::DebugDisplayRequests& debugDisplay,
-            const AZ::Vector3& position, const size_t index, const float textSize)
+            AzFramework::DebugDisplayRequests& debugDisplay, const AZ::Vector3& position, const size_t index, const float textSize)
         {
             AZStd::string indexFormat = AZStd::string::format("[%zu]", index);
             debugDisplay.DrawTextLabel(position, textSize, indexFormat.c_str(), true);
@@ -36,7 +35,8 @@ namespace AzToolsFramework
             const AZ::FixedVertices<Vertex>& vertices,
             const AZ::Transform& transform,
             const AZ::Vector3& nonUniformScale,
-            const bool selected, const float textSize,
+            const bool selected,
+            const float textSize,
             const AZ::Color& textColor,
             const AZ::Vector3& textOffset)
         {
@@ -52,11 +52,12 @@ namespace AzToolsFramework
                 if (vertices.GetVertex(vertIndex, vertex))
                 {
                     DisplayVertexContainerIndex(
-                        debugDisplay, transform.TransformPoint(nonUniformScale * (AdaptVertexOut(vertex) + textOffset)), vertIndex, textSize);
+                        debugDisplay, transform.TransformPoint(nonUniformScale * (AdaptVertexOut(vertex) + textOffset)), vertIndex,
+                        textSize);
                 }
             }
         }
-    }
+    } // namespace VertexContainerDisplay
 
     // explicit template instantiations
     template void VertexContainerDisplay::DisplayVertexContainerIndices(
@@ -64,7 +65,8 @@ namespace AzToolsFramework
         const AZ::FixedVertices<AZ::Vector2>& vertices,
         const AZ::Transform& transform,
         const AZ::Vector3& nonUniformScale,
-        bool selected, float textSize,
+        bool selected,
+        float textSize,
         const AZ::Color& textColor,
         const AZ::Vector3& textOffset);
     template void VertexContainerDisplay::DisplayVertexContainerIndices(
@@ -72,7 +74,8 @@ namespace AzToolsFramework
         const AZ::FixedVertices<AZ::Vector3>& vertices,
         const AZ::Transform& transform,
         const AZ::Vector3& nonUniformScale,
-        bool selected, float textSize,
+        bool selected,
+        float textSize,
         const AZ::Color& textColor,
         const AZ::Vector3& textOffset);
-}
+} // namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/VertexContainerDisplay.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/VertexContainerDisplay.h
index 1717d770df..c734740d3c 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/VertexContainerDisplay.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/VertexContainerDisplay.h
@@ -1,14 +1,14 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
 #pragma once
 
@@ -22,22 +22,23 @@ namespace AzFramework
 
 namespace AzToolsFramework
 {
-    /// Utility functions for rendering vertex container indices.
+    //! Utility functions for rendering vertex container indices.
     namespace VertexContainerDisplay
     {
         extern const float DefaultVertexTextSize;
         extern const AZ::Color DefaultVertexTextColor;
         extern const AZ::Vector3 DefaultVertexTextOffset;
 
-        /// Displays all vertex container indices as text at the position of each vertex when selected
+        //! Displays all vertex container indices as text at the position of each vertex when selected
         template<typename Vertex>
         void DisplayVertexContainerIndices(
             AzFramework::DebugDisplayRequests& debugDisplay,
             const AZ::FixedVertices<Vertex>& vertices,
             const AZ::Transform& transform,
             const AZ::Vector3& nonUniformScale,
-            bool selected, float textSize = DefaultVertexTextSize,
+            bool selected,
+            float textSize = DefaultVertexTextSize,
             const AZ::Color& textColor = DefaultVertexTextColor,
             const AZ::Vector3& textOffset = DefaultVertexTextOffset);
-    }
+    } // namespace VertexContainerDisplay
 } // namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.h
index 91eee18cb7..85250f2a32 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.h
@@ -1,14 +1,14 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
 #pragma once
 
@@ -17,8 +17,8 @@
 #include <AzFramework/Entity/EntityContextBus.h>
 #include <AzFramework/Entity/EntityDebugDisplayBus.h>
 #include <AzFramework/Viewport/CameraState.h>
-#include <AzFramework/Viewport/ViewportId.h>
 #include <AzFramework/Viewport/ClickDetector.h>
+#include <AzFramework/Viewport/ViewportId.h>
 #include <AzToolsFramework/Entity/EditorEntityContextBus.h>
 #include <AzToolsFramework/Viewport/ViewportTypes.h>
 
@@ -31,45 +31,51 @@ namespace AzToolsFramework
 {
     namespace ViewportInteraction
     {
-        /// Result of handling mouse interaction.
+        //! Result of handling mouse interaction.
         enum class MouseInteractionResult
         {
-            Manipulator,    ///< The manipulator manager handled the interaction.
-            Viewport,       ///< The viewport handled the interaction.
-            None            ///< The interaction was not handled.
+            Manipulator, //!< The manipulator manager handled the interaction.
+            Viewport, //!< The viewport handled the interaction.
+            None //!< The interaction was not handled.
         };
 
-        /// Interface for handling mouse viewport events.
+        //! Interface for handling mouse viewport events.
         class MouseViewportRequests
         {
         public:
-            /// @cond
+            //! @cond
             virtual ~MouseViewportRequests() = default;
-            /// @endcond
+            //! @endcond
 
-            /// Implement this function to handle a particular mouse event.
-            virtual bool HandleMouseInteraction(
-                const MouseInteractionEvent& /*mouseInteraction*/) { return false; }
+            //! Implement this function to handle a particular mouse event.
+            virtual bool HandleMouseInteraction(const MouseInteractionEvent& /*mouseInteraction*/)
+            {
+                return false;
+            }
         };
-        
-        /// Interface for internal handling mouse viewport events.
+
+        //! Interface for internal handling mouse viewport events.
         class InternalMouseViewportRequests
         {
         public:
-            /// @cond
+            //! @cond
             virtual ~InternalMouseViewportRequests() = default;
-            /// @endcond
+            //! @endcond
 
-            /// Implement this function to have the viewport handle this mouse event.
-            virtual bool InternalHandleMouseViewportInteraction(
-                const MouseInteractionEvent& /*mouseInteraction*/) { return false; }
+            //! Implement this function to have the viewport handle this mouse event.
+            virtual bool InternalHandleMouseViewportInteraction(const MouseInteractionEvent& /*mouseInteraction*/)
+            {
+                return false;
+            }
 
-            /// Implement this function to have manipulators handle this mouse event.
-            virtual bool InternalHandleMouseManipulatorInteraction(
-                const MouseInteractionEvent& /*mouseInteraction*/) { return false; }
+            //! Implement this function to have manipulators handle this mouse event.
+            virtual bool InternalHandleMouseManipulatorInteraction(const MouseInteractionEvent& /*mouseInteraction*/)
+            {
+                return false;
+            }
 
-            /// Helper to call both viewport and manipulator handle mouse events
-            /// @note Manipulators always attempt to intercept the event first.
+            //! Helper to call both viewport and manipulator handle mouse events
+            //! @note Manipulators always attempt to intercept the event first.
             MouseInteractionResult InternalHandleAllMouseInteractions(const MouseInteractionEvent& mouseInteraction);
         };
 
@@ -90,117 +96,118 @@ namespace AzToolsFramework
             }
         }
 
-        /// Interface for viewport selection behaviors.
+        //! Interface for viewport selection behaviors.
         class ViewportDisplayNotifications
         {
         public:
-            /// @cond
+            //! @cond
             virtual ~ViewportDisplayNotifications() = default;
-            /// @endcond
+            //! @endcond
 
-            /// Display drawing in world space.
-            /// \ref DisplayViewportSelection is called from \ref EditorInteractionSystemComponent::DisplayViewport.
-            /// DisplayViewport exists on the \ref AzFramework::ViewportDebugDisplayEventBus and is called from \ref CRenderViewport.
-            /// \ref DisplayViewportSelection is called after \ref CalculateVisibleEntityDatas on the \ref EditorVisibleEntityDataCache,
-            /// this ensures usage of the entity cache will be up to date (do not implement \ref AzFramework::ViewportDebugDisplayEventBus
-            /// directly if wishing to use the \ref EditorVisibleEntityDataCache).
+            //! Display drawing in world space.
+            //! \ref DisplayViewportSelection is called from \ref EditorInteractionSystemComponent::DisplayViewport.
+            //! DisplayViewport exists on the \ref AzFramework::ViewportDebugDisplayEventBus and is called from \ref CRenderViewport.
+            //! \ref DisplayViewportSelection is called after \ref CalculateVisibleEntityDatas on the \ref EditorVisibleEntityDataCache,
+            //! this ensures usage of the entity cache will be up to date (do not implement \ref AzFramework::ViewportDebugDisplayEventBus
+            //! directly if wishing to use the \ref EditorVisibleEntityDataCache).
             virtual void DisplayViewportSelection(
-                const AzFramework::ViewportInfo& /*viewportInfo*/,
-                AzFramework::DebugDisplayRequests& /*debugDisplay*/) {}
-            /// Display drawing in screen space.
-            /// \ref DisplayViewportSelection2d is called after \ref DisplayViewportSelection when the viewport has been
-            /// configured to be orthographic in \ref CRenderViewport. All screen space drawing can be performed here.
+                const AzFramework::ViewportInfo& /*viewportInfo*/, AzFramework::DebugDisplayRequests& /*debugDisplay*/)
+            {
+            }
+            //! Display drawing in screen space.
+            //! \ref DisplayViewportSelection2d is called after \ref DisplayViewportSelection when the viewport has been
+            //! configured to be orthographic in \ref CRenderViewport. All screen space drawing can be performed here.
             virtual void DisplayViewportSelection2d(
-                const AzFramework::ViewportInfo& /*viewportInfo*/,
-                AzFramework::DebugDisplayRequests& /*debugDisplay*/) {}
+                const AzFramework::ViewportInfo& /*viewportInfo*/, AzFramework::DebugDisplayRequests& /*debugDisplay*/)
+            {
+            }
         };
 
-        /// Interface for internal handling mouse viewport events and display notifications.
-        /// Implement this for types wishing to provide viewport functionality and
-        /// set it by using \ref EditorInteractionSystemViewportSelectionRequestBus.
+        //! Interface for internal handling mouse viewport events and display notifications.
+        //! Implement this for types wishing to provide viewport functionality and
+        //! set it by using \ref EditorInteractionSystemViewportSelectionRequestBus.
         class InternalViewportSelectionRequests
             : public ViewportDisplayNotifications
             , public InternalMouseViewportRequests
         {
         };
 
-        /// Interface for handling mouse viewport events and display notifications.
-        /// Use this interface for composition types used by InternalViewportSelectionRequests.
+        //! Interface for handling mouse viewport events and display notifications.
+        //! Use this interface for composition types used by InternalViewportSelectionRequests.
         class ViewportSelectionRequests
             : public ViewportDisplayNotifications
             , public MouseViewportRequests
         {
         };
 
-        /// The EBusTraits for ViewportInteractionRequests.
-        class ViewportEBusTraits
-            : public AZ::EBusTraits
+        //! The EBusTraits for ViewportInteractionRequests.
+        class ViewportEBusTraits : public AZ::EBusTraits
         {
         public:
-            using BusIdType = AzFramework::ViewportId; ///< ViewportId - used to address requests to this EBus.
+            using BusIdType = AzFramework::ViewportId; //!< ViewportId - used to address requests to this EBus.
             static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::ById;
             static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
         };
 
-        /// A ray projection, originating from a point and extending in a direction specified as a normal.
+        //! A ray projection, originating from a point and extending in a direction specified as a normal.
         struct ProjectedViewportRay
         {
             AZ::Vector3 origin;
             AZ::Vector3 direction;
         };
 
-        /// Requests that can be made to the viewport to query and modify its state.
+        //! Requests that can be made to the viewport to query and modify its state.
         class ViewportInteractionRequests
         {
         public:
-            /// Return the current camera state for this viewport.
+            //! Return the current camera state for this viewport.
             virtual AzFramework::CameraState GetCameraState() = 0;
-            /// Return if grid snapping is enabled.
+            //! Return if grid snapping is enabled.
             virtual bool GridSnappingEnabled() = 0;
-            /// Return the grid snapping size.
+            //! Return the grid snapping size.
             virtual float GridSize() = 0;
-            /// Does the grid currently want to be displayed.
+            //! Does the grid currently want to be displayed.
             virtual bool ShowGrid() = 0;
-            /// Return if angle snapping is enabled.
+            //! Return if angle snapping is enabled.
             virtual bool AngleSnappingEnabled() = 0;
-            /// Return the angle snapping/step size.
+            //! Return the angle snapping/step size.
             virtual float AngleStep() = 0;
-            /// Transform a point in world space to screen space coordinates in Qt Widget space.
-            /// Multiply by DeviceScalingFactor to get the position in viewport pixel space.
+            //! Transform a point in world space to screen space coordinates in Qt Widget space.
+            //! Multiply by DeviceScalingFactor to get the position in viewport pixel space.
             virtual AzFramework::ScreenPoint ViewportWorldToScreen(const AZ::Vector3& worldPosition) = 0;
-            /// Transform a point from Qt widget screen space to world space based on the given clip space depth.
-            /// Depth specifies a relative camera depth to project in the range of [0.f, 1.f].
-            /// Returns the world space position if successful.
+            //! Transform a point from Qt widget screen space to world space based on the given clip space depth.
+            //! Depth specifies a relative camera depth to project in the range of [0.f, 1.f].
+            //! Returns the world space position if successful.
             virtual AZStd::optional<AZ::Vector3> ViewportScreenToWorld(const AzFramework::ScreenPoint& screenPosition, float depth) = 0;
-            /// Casts a point in screen space to a ray in world space originating from the viewport camera frustum's near plane.
-            /// Returns a ray containing the ray's origin and a direction normal, if successful.
+            //! Casts a point in screen space to a ray in world space originating from the viewport camera frustum's near plane.
+            //! Returns a ray containing the ray's origin and a direction normal, if successful.
             virtual AZStd::optional<ProjectedViewportRay> ViewportScreenToWorldRay(const AzFramework::ScreenPoint& screenPosition) = 0;
-            /// Gets the DPI scaling factor that translates Qt widget space into viewport pixel space.
+            //! Gets the DPI scaling factor that translates Qt widget space into viewport pixel space.
             virtual float DeviceScalingFactor() = 0;
 
         protected:
             ~ViewportInteractionRequests() = default;
         };
 
-        /// Interface to return only viewport specific settings (e.g. snapping).
+        //! Interface to return only viewport specific settings (e.g. snapping).
         class ViewportSettings
         {
         public:
             virtual ~ViewportSettings() = default;
 
-            /// Return if grid snapping is enabled.
+            //! Return if grid snapping is enabled.
             virtual bool GridSnappingEnabled() const = 0;
-            /// Return the grid snapping size.
+            //! Return the grid snapping size.
             virtual float GridSize() const = 0;
-            /// Does the grid currently want to be displayed.
+            //! Does the grid currently want to be displayed.
             virtual bool ShowGrid() const = 0;
-            /// Return if angle snapping is enabled.
+            //! Return if angle snapping is enabled.
             virtual bool AngleSnappingEnabled() const = 0;
-            /// Return the angle snapping/step size.
+            //! Return the angle snapping/step size.
             virtual float AngleStep() const = 0;
         };
 
-        /// Type to inherit to implement ViewportInteractionRequests.
+        //! Type to inherit to implement ViewportInteractionRequests.
         using ViewportInteractionRequestBus = AZ::EBus<ViewportInteractionRequests, ViewportEBusTraits>;
 
         //! Requests to freeze the Viewport Input
@@ -221,62 +228,62 @@ namespace AzToolsFramework
         //! Type to inherit to implement ViewportFreezeRequests.
         using ViewportFreezeRequestBus = AZ::EBus<ViewportFreezeRequests, ViewportEBusTraits>;
 
-        /// Viewport requests that are only guaranteed to be serviced by the Main Editor viewport.
+        //! Viewport requests that are only guaranteed to be serviced by the Main Editor viewport.
         class MainEditorViewportInteractionRequests
         {
         public:
-            /// Given a point in screen space, return the picked entity (if any).
-            /// Picked EntityId will be returned, InvalidEntityId will be returned on failure.
+            //! Given a point in screen space, return the picked entity (if any).
+            //! Picked EntityId will be returned, InvalidEntityId will be returned on failure.
             virtual AZ::EntityId PickEntity(const AzFramework::ScreenPoint& point) = 0;
-            /// Given a point in screen space, return the terrain position in world space.
+            //! Given a point in screen space, return the terrain position in world space.
             virtual AZ::Vector3 PickTerrain(const AzFramework::ScreenPoint& point) = 0;
-            /// Return the terrain height given a world position in 2d (xy plane).
+            //! Return the terrain height given a world position in 2d (xy plane).
             virtual float TerrainHeight(const AZ::Vector2& position) = 0;
-            /// Given the current view frustum (viewport) return all visible entities.
+            //! Given the current view frustum (viewport) return all visible entities.
             virtual void FindVisibleEntities(AZStd::vector<AZ::EntityId>& visibleEntities) = 0;
-            /// Is the user holding a modifier key to move the manipulator space from local to world.
+            //! Is the user holding a modifier key to move the manipulator space from local to world.
             virtual bool ShowingWorldSpace() = 0;
-            /// Return the widget to use as the parent for the viewport context menu.
+            //! Return the widget to use as the parent for the viewport context menu.
             virtual QWidget* GetWidgetForViewportContextMenu() = 0;
-            /// Set the render context for the viewport.
+            //! Set the render context for the viewport.
             virtual void BeginWidgetContext() = 0;
-            /// End the render context for the viewport.
-            /// Return to previous context before Begin was called.
+            //! End the render context for the viewport.
+            //! Return to previous context before Begin was called.
             virtual void EndWidgetContext() = 0;
 
         protected:
             ~MainEditorViewportInteractionRequests() = default;
         };
 
-        /// Type to inherit to implement MainEditorViewportInteractionRequests.
+        //! Type to inherit to implement MainEditorViewportInteractionRequests.
         using MainEditorViewportInteractionRequestBus = AZ::EBus<MainEditorViewportInteractionRequests, ViewportEBusTraits>;
 
-        /// Viewport requests for managing the viewport's cursor state.
+        //! Viewport requests for managing the viewport's cursor state.
         class ViewportMouseCursorRequests
         {
         public:
-            /// Begins hiding the cursor and locking it in place, to prevent the cursor from escaping the viewport window.
+            //! Begins hiding the cursor and locking it in place, to prevent the cursor from escaping the viewport window.
             virtual void BeginCursorCapture() = 0;
-            /// Restores the cursor and ends locking it in place, allowing it to be moved freely.
+            //! Restores the cursor and ends locking it in place, allowing it to be moved freely.
             virtual void EndCursorCapture() = 0;
-            /// Gets the most recent recorded cursor position in the viewport in screen space coordinates.
+            //! Gets the most recent recorded cursor position in the viewport in screen space coordinates.
             virtual AzFramework::ScreenPoint ViewportCursorScreenPosition() = 0;
-            /// Gets the cursor position recorded prior to the most recent cursor position.
-            /// Note: The cursor may be captured by the viewport, in which case this may not correspond to the last result
-            /// from ViewportCursorScreenPosition. This method will always return the correct position to generate a mouse
-            /// position delta.
+            //! Gets the cursor position recorded prior to the most recent cursor position.
+            //! Note: The cursor may be captured by the viewport, in which case this may not correspond to the last result
+            //! from ViewportCursorScreenPosition. This method will always return the correct position to generate a mouse
+            //! position delta.
             virtual AZStd::optional<AzFramework::ScreenPoint> PreviousViewportCursorScreenPosition() = 0;
-            /// Is mouse over viewport.
+            //! Is mouse over viewport.
             virtual bool IsMouseOver() const = 0;
 
         protected:
             ~ViewportMouseCursorRequests() = default;
         };
 
-        /// Type to inherit to implement MainEditorViewportInteractionRequests.
+        //! Type to inherit to implement MainEditorViewportInteractionRequests.
         using ViewportMouseCursorRequestBus = AZ::EBus<ViewportMouseCursorRequests, ViewportEBusTraits>;
 
-        /// A helper to wrap Begin/EndWidgetContext.
+        //! A helper to wrap Begin/EndWidgetContext.
         class WidgetContextGuard
         {
         public:
@@ -294,17 +301,16 @@ namespace AzToolsFramework
             }
 
         private:
-            int m_viewportId; ///< The viewport id the widget context is being set on.
+            int m_viewportId; //!< The viewport id the widget context is being set on.
         };
 
     } // namespace ViewportInteraction
 
-    /// Utility function to return EntityContextId.
+    //! Utility function to return EntityContextId.
     inline AzFramework::EntityContextId GetEntityContextId()
     {
         AzFramework::EntityContextId entityContextId;
-        EditorEntityContextRequestBus::BroadcastResult(
-            entityContextId, &EditorEntityContextRequests::GetEditorEntityContextId);
+        EditorEntityContextRequestBus::BroadcastResult(entityContextId, &EditorEntityContextRequests::GetEditorEntityContextId);
 
         return entityContextId;
     }
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportTypes.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportTypes.cpp
index 8d26054562..99808fcd56 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportTypes.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportTypes.cpp
@@ -1,14 +1,14 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
 #include "ViewportTypes.h"
 
@@ -23,26 +23,24 @@ namespace AzToolsFramework
         {
             if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
             {
-                serializeContext->Class<KeyboardModifiers>()->
-                    Field("KeyboardModifiers", &KeyboardModifiers::m_keyModifiers);
+                serializeContext->Class<KeyboardModifiers>()->Field("KeyboardModifiers", &KeyboardModifiers::m_keyModifiers);
 
-                serializeContext->Class<MouseButtons>()->
-                    Field("MouseButtons", &MouseButtons::m_mouseButtons);
+                serializeContext->Class<MouseButtons>()->Field("MouseButtons", &MouseButtons::m_mouseButtons);
 
-                serializeContext->Class<InteractionId>()->
-                    Field("CameraId", &InteractionId::m_cameraId)->
-                    Field("ViewportId", &InteractionId::m_viewportId);
+                serializeContext->Class<InteractionId>()
+                    ->Field("CameraId", &InteractionId::m_cameraId)
+                    ->Field("ViewportId", &InteractionId::m_viewportId);
 
-                serializeContext->Class<MousePick>()->
-                    Field("RayOrigin", &MousePick::m_rayOrigin)->
-                    Field("RayDirection", &MousePick::m_rayDirection)->
-                    Field("ScreenCoordinates", &MousePick::m_screenCoordinates);
+                serializeContext->Class<MousePick>()
+                    ->Field("RayOrigin", &MousePick::m_rayOrigin)
+                    ->Field("RayDirection", &MousePick::m_rayDirection)
+                    ->Field("ScreenCoordinates", &MousePick::m_screenCoordinates);
 
-                serializeContext->Class<MouseInteraction>()->
-                    Field("MousePick", &MouseInteraction::m_mousePick)->
-                    Field("MouseButtons", &MouseInteraction::m_mouseButtons)->
-                    Field("InteractionId", &MouseInteraction::m_interactionId)->
-                    Field("KeyboardModifiers", &MouseInteraction::m_keyboardModifiers);
+                serializeContext->Class<MouseInteraction>()
+                    ->Field("MousePick", &MouseInteraction::m_mousePick)
+                    ->Field("MouseButtons", &MouseInteraction::m_mouseButtons)
+                    ->Field("InteractionId", &MouseInteraction::m_interactionId)
+                    ->Field("KeyboardModifiers", &MouseInteraction::m_keyboardModifiers);
 
                 MouseInteractionEvent::Reflect(*serializeContext);
             }
@@ -50,10 +48,10 @@ namespace AzToolsFramework
 
         void MouseInteractionEvent::Reflect(AZ::SerializeContext& serializeContext)
         {
-            serializeContext.Class<MouseInteractionEvent>()->
-                Field("MouseInteraction", &MouseInteractionEvent::m_mouseInteraction)->
-                Field("MouseEvent", &MouseInteractionEvent::m_mouseEvent)->
-                Field("WheelDelta", &MouseInteractionEvent::m_wheelDelta);
+            serializeContext.Class<MouseInteractionEvent>()
+                ->Field("MouseInteraction", &MouseInteractionEvent::m_mouseInteraction)
+                ->Field("MouseEvent", &MouseInteractionEvent::m_mouseEvent)
+                ->Field("WheelDelta", &MouseInteractionEvent::m_wheelDelta);
         }
-    }
-}
+    } // namespace ViewportInteraction
+} // namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportTypes.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportTypes.h
index d59044e68f..ad045888bc 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportTypes.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportTypes.h
@@ -1,14 +1,14 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
 #pragma once
 
@@ -27,57 +27,75 @@ namespace AZ
 
 namespace AzToolsFramework
 {
-    /// Viewport related types that are used when interacting with the viewport.
+    //! Viewport related types that are used when interacting with the viewport.
     namespace ViewportInteraction
     {
-        /// Flags to represent each modifier key.
+        //! Flags to represent each modifier key.
         enum class KeyboardModifier : AZ::u32
         {
-            None = 0, ///< No keyboard modifier.
-            Alt = 0x01, ///< Alt keyboard modifier.
-            Shift = 0x02, ///< Shift keyboard modifier.
-            Ctrl = 0x04, ///< Ctrl keyboard modifier.
-            Control = Ctrl ///< Alias for Ctrl modifier.
+            None = 0, //!< No keyboard modifier.
+            Alt = 0x01, //!< Alt keyboard modifier.
+            Shift = 0x02, //!< Shift keyboard modifier.
+            Ctrl = 0x04, //!< Ctrl keyboard modifier.
+            Control = Ctrl //!< Alias for Ctrl modifier.
         };
 
-        /// Flags to represent each mouse button.
+        //! Flags to represent each mouse button.
         enum class MouseButton : AZ::u32
         {
-            None = 0, ///< No mouse buttons.
-            Left = 0x01, ///< Left mouse button.
-            Middle = 0x02, ///< Middle mouse button.
-            Right = 0x04 ///< Right mouse button.
+            None = 0, //!< No mouse buttons.
+            Left = 0x01, //!< Left mouse button.
+            Middle = 0x02, //!< Middle mouse button.
+            Right = 0x04 //!< Right mouse button.
         };
 
-        /// The type of mouse event that occurred.
+        //! The type of mouse event that occurred.
         enum class MouseEvent
         {
-            Up, ///< Mouse up event,
-            Down, ///< Mouse down event.
-            DoubleClick, ///< Mouse double click event.
-            Wheel, ///< Mouse wheel event.
-            Move, ///< Mouse move event.
+            Up, //!< Mouse up event,
+            Down, //!< Mouse down event.
+            DoubleClick, //!< Mouse double click event.
+            Wheel, //!< Mouse wheel event.
+            Move, //!< Mouse move event.
         };
 
-        /// Interface over keyboard modifier to query which key is pressed.
+        //! Interface over keyboard modifier to query which key is pressed.
         struct KeyboardModifiers
         {
-            /// @cond
+            //! @cond
             AZ_TYPE_INFO(KeyboardModifiers, "{2635F4DF-E7DC-4919-A97B-9AE35FE086D8}");
             KeyboardModifiers() = default;
-            /// @endcond
+            //! @endcond
 
-            /// Explicit constructor to create a KeyboardModifier struct.
-            explicit KeyboardModifiers(const AZ::u32 keyModifiers) : m_keyModifiers(keyModifiers) {}
+            //! Explicit constructor to create a KeyboardModifier struct.
+            explicit KeyboardModifiers(const AZ::u32 keyModifiers)
+                : m_keyModifiers(keyModifiers)
+            {
+            }
 
-            /// Given the current keyboard modifiers, is the Alt key held.
-            bool Alt() const { return (m_keyModifiers & static_cast<AZ::u32>(KeyboardModifier::Alt)) != 0; }
-            /// Given the current keyboard modifiers, is the Shift key held.
-            bool Shift() const { return (m_keyModifiers & static_cast<AZ::u32>(KeyboardModifier::Shift)) != 0; }
-            /// Given the current keyboard modifiers, is the Ctrl key held.
-            bool Ctrl() const { return (m_keyModifiers & static_cast<AZ::u32>(KeyboardModifier::Ctrl)) != 0; }
-            /// Given the current keyboard modifiers, are none being held.
-            bool None() const { return m_keyModifiers == static_cast<AZ::u32>(KeyboardModifier::None); }
+            //! Given the current keyboard modifiers, is the Alt key held.
+            bool Alt() const
+            {
+                return (m_keyModifiers & static_cast<AZ::u32>(KeyboardModifier::Alt)) != 0;
+            }
+
+            //! Given the current keyboard modifiers, is the Shift key held.
+            bool Shift() const
+            {
+                return (m_keyModifiers & static_cast<AZ::u32>(KeyboardModifier::Shift)) != 0;
+            }
+
+            //! Given the current keyboard modifiers, is the Ctrl key held.
+            bool Ctrl() const
+            {
+                return (m_keyModifiers & static_cast<AZ::u32>(KeyboardModifier::Ctrl)) != 0;
+            }
+
+            //! Given the current keyboard modifiers, are none being held.
+            bool None() const
+            {
+                return m_keyModifiers == static_cast<AZ::u32>(KeyboardModifier::None);
+            }
 
             bool operator==(const KeyboardModifiers& keyboardModifiers) const
             {
@@ -89,132 +107,162 @@ namespace AzToolsFramework
                 return m_keyModifiers != keyboardModifiers.m_keyModifiers;
             }
 
-            AZ::u32 m_keyModifiers = 0; ///< Raw keyboard modifier state.
+            AZ::u32 m_keyModifiers = 0; //!< Raw keyboard modifier state.
         };
 
-        /// Interface over mouse buttons to query which button is pressed.
+        //! Interface over mouse buttons to query which button is pressed.
         struct MouseButtons
         {
-            /// @cond
+            //! @cond
             AZ_TYPE_INFO(MouseButtons, "{1D137B5D-73BF-4FD9-BECA-85E6DC3786CB}");
             MouseButtons() = default;
-            /// @endcond
+            //! @endcond
 
-            /// Explicit constructor to create a MouseButton struct.
-            explicit MouseButtons(const AZ::u32 mouseButtons) : m_mouseButtons(mouseButtons) {}
+            //! Explicit constructor to create a MouseButton struct.
+            explicit MouseButtons(const AZ::u32 mouseButtons)
+                : m_mouseButtons(mouseButtons)
+            {
+            }
 
-            /// Given the current mouse state, is the left mouse button held.
-            bool Left() const { return (m_mouseButtons & static_cast<AZ::u32>(MouseButton::Left)) != 0; }
-            /// Given the current mouse state, is the middle mouse button held.
-            bool Middle() const { return (m_mouseButtons & static_cast<AZ::u32>(MouseButton::Middle)) != 0; }
-            /// Given the current mouse state, is the right mouse button held.
-            bool Right() const { return (m_mouseButtons & static_cast<AZ::u32>(MouseButton::Right)) != 0; }
-            /// Given the current mouse state, are no mouse buttons held.
-            bool None() const { return m_mouseButtons == static_cast<AZ::u32>(MouseButton::None); }
-            /// Given the current mouse state, are any mouse buttons held.
-            bool Any() const { return m_mouseButtons != static_cast<AZ::u32>(MouseButton::None); }
+            //! Given the current mouse state, is the left mouse button held.
+            bool Left() const
+            {
+                return (m_mouseButtons & static_cast<AZ::u32>(MouseButton::Left)) != 0;
+            }
 
-            AZ::u32 m_mouseButtons = 0; ///< Current mouse button state (flags).
+            //! Given the current mouse state, is the middle mouse button held.
+            bool Middle() const
+            {
+                return (m_mouseButtons & static_cast<AZ::u32>(MouseButton::Middle)) != 0;
+            }
+
+            //! Given the current mouse state, is the right mouse button held.
+            bool Right() const
+            {
+                return (m_mouseButtons & static_cast<AZ::u32>(MouseButton::Right)) != 0;
+            }
+
+            //! Given the current mouse state, are no mouse buttons held.
+            bool None() const
+            {
+                return m_mouseButtons == static_cast<AZ::u32>(MouseButton::None);
+            }
+
+            //! Given the current mouse state, are any mouse buttons held.
+            bool Any() const
+            {
+                return m_mouseButtons != static_cast<AZ::u32>(MouseButton::None);
+            }
+
+            AZ::u32 m_mouseButtons = 0; //!< Current mouse button state (flags).
         };
 
-        /// Information relevant when interacting with a particular viewport.
+        //! Information relevant when interacting with a particular viewport.
         struct InteractionId
         {
-            /// @cond
+            //! @cond
             AZ_TYPE_INFO(InteractionId, "{35593FC2-846F-4AAD-8044-4CD84EC84F9A}");
             InteractionId() = default;
-            /// @endcond
+            //! @endcond
 
             InteractionId(AZ::EntityId cameraId, int viewportId)
-                : m_cameraId(cameraId), m_viewportId(viewportId) {}
+                : m_cameraId(cameraId)
+                , m_viewportId(viewportId)
+            {
+            }
 
-            AZ::EntityId m_cameraId; ///< The entity id of the viewport camera.
-            int m_viewportId = 0; ///< The id of the viewport being interacted with.
+            AZ::EntityId m_cameraId; //!< The entity id of the viewport camera.
+            int m_viewportId = 0; //!< The id of the viewport being interacted with.
         };
 
-        /// Data representing a mouse pick ray.
+        //! Data representing a mouse pick ray.
         struct MousePick
         {
-            /// @cond
+            //! @cond
             AZ_TYPE_INFO(MousePick, "{A69B9562-FC8C-4DE7-9137-0FF867B1513D}");
             MousePick() = default;
-            /// @endcond
+            //! @endcond
 
-            AZ::Vector3 m_rayOrigin = AZ::Vector3::CreateZero(); ///< World space.
-            AZ::Vector3 m_rayDirection = AZ::Vector3::CreateZero(); ///< World space - normalized.
-            AzFramework::ScreenPoint m_screenCoordinates = {}; ///< Screen space.
+            AZ::Vector3 m_rayOrigin = AZ::Vector3::CreateZero(); //!< World space.
+            AZ::Vector3 m_rayDirection = AZ::Vector3::CreateZero(); //!< World space - normalized.
+            AzFramework::ScreenPoint m_screenCoordinates = {}; //!< Screen space.
         };
 
-        /// State relating to an individual mouse interaction.
+        //! State relating to an individual mouse interaction.
         struct MouseInteraction
         {
-            /// @cond
+            //! @cond
             AZ_TYPE_INFO(MouseInteraction, "{E67357C3-DFE1-40DF-921F-9CBCFE63A68C}");
             MouseInteraction() = default;
-            /// @endcond
+            //! @endcond
 
-            MousePick m_mousePick; ///< The mouse pick ray in world space and screen coordinates in screen space.
-            MouseButtons m_mouseButtons; ///< The current state of the mouse buttons.
+            MousePick m_mousePick; //!< The mouse pick ray in world space and screen coordinates in screen space.
+            MouseButtons m_mouseButtons; //!< The current state of the mouse buttons.
             InteractionId m_interactionId; /**< The EntityId of the camera this click came from
-                                             *  and the id of the viewport it originated from. */
-            KeyboardModifiers m_keyboardModifiers; ///< The state of the keyboard modifiers (Alt/Ctrl/Shift).
+                                            *  and the id of the viewport it originated from. */
+            KeyboardModifiers m_keyboardModifiers; //!< The state of the keyboard modifiers (Alt/Ctrl/Shift).
         };
 
-        /// Structure to compose MouseInteraction (mouse state) and
-        /// MouseEvent (MouseEvent::MouseUp/MouseEvent::DownMove etc.)
+        //! Structure to compose MouseInteraction (mouse state) and
+        //! MouseEvent (MouseEvent::MouseUp/MouseEvent::DownMove etc.)
         struct MouseInteractionEvent
         {
-            /// @cond
+            //! @cond
             AZ_TYPE_INFO(MouseInteractionEvent, "{67FE0826-DD59-4B5B-BEFE-421E83EA7F31}");
             MouseInteractionEvent() = default;
-            /// @endcond
+            //! @endcond
 
             static void Reflect(AZ::SerializeContext& context);
 
-            /// Constructor to create a default MouseInteractionEvent
+            //! Constructor to create a default MouseInteractionEvent
             MouseInteractionEvent(MouseInteraction mouseInteraction, const MouseEvent mouseEvent)
                 : m_mouseInteraction(std::move(mouseInteraction))
-                , m_mouseEvent(mouseEvent) {}
+                , m_mouseEvent(mouseEvent)
+            {
+            }
 
-            /// Special constructor for mouse wheel event.
+            //! Special constructor for mouse wheel event.
             MouseInteractionEvent(MouseInteraction mouseInteraction, const float wheelDelta)
                 : m_mouseInteraction(std::move(mouseInteraction))
                 , m_mouseEvent(MouseEvent::Wheel)
-                , m_wheelDelta(wheelDelta) {}
+                , m_wheelDelta(wheelDelta)
+            {
+            }
 
-            MouseInteraction m_mouseInteraction; ///< Mouse state.
-            MouseEvent m_mouseEvent; ///< Mouse event.
+            MouseInteraction m_mouseInteraction; //!< Mouse state.
+            MouseEvent m_mouseEvent; //!< Mouse event.
 
-            /// Special friend function to return the mouse wheel delta (scroll amount)
-            /// if the event was of type MouseEvent::Wheel.
+            //! Special friend function to return the mouse wheel delta (scroll amount)
+            //! if the event was of type MouseEvent::Wheel.
             friend float MouseWheelDelta(const MouseInteractionEvent& mouseInteractionEvent);
 
         private:
-            float m_wheelDelta = 0.0f; ///< The amount the mouse wheel moved during a mouse wheel event.
+            float m_wheelDelta = 0.0f; //!< The amount the mouse wheel moved during a mouse wheel event.
         };
 
-        /// Checked access to mouse wheel delta - ensure event originated from the mouse wheel.
+        //! Checked access to mouse wheel delta - ensure event originated from the mouse wheel.
         inline float MouseWheelDelta(const MouseInteractionEvent& mouseInteractionEvent)
         {
-            AZ_Assert(mouseInteractionEvent.m_mouseEvent == MouseEvent::Wheel,
+            AZ_Assert(
+                mouseInteractionEvent.m_mouseEvent == MouseEvent::Wheel,
                 "Attempting to access mouse wheel delta when mouse interaction event was not mouse wheel");
 
             return mouseInteractionEvent.m_wheelDelta;
         }
 
-        /// Return QPoint from AzFramework::ScreenPoint.
+        //! Return QPoint from AzFramework::ScreenPoint.
         inline QPoint QPointFromScreenPoint(const AzFramework::ScreenPoint& screenPoint)
         {
-            return {screenPoint.m_x, screenPoint.m_y};
+            return { screenPoint.m_x, screenPoint.m_y };
         }
 
-        /// Return AzFramework::ScreenPoint from QPoint.
+        //! Return AzFramework::ScreenPoint from QPoint.
         inline AzFramework::ScreenPoint ScreenPointFromQPoint(const QPoint& qpoint)
         {
-            return AzFramework::ScreenPoint{qpoint.x(), qpoint.y()};
+            return AzFramework::ScreenPoint{ qpoint.x(), qpoint.y() };
         }
 
-        /// Map from Qt -> Open 3D Engine buttons.>>>>>>> main
+        //! Map from Qt -> Open 3D Engine buttons.>>>>>>> main
         inline AZ::u32 TranslateMouseButtons(const Qt::MouseButtons buttons)
         {
             AZ::u32 result = 0;
@@ -224,7 +272,7 @@ namespace AzToolsFramework
             return result;
         }
 
-        /// Map from Qt -> Open 3D Engine modifiers.
+        //! Map from Qt -> Open 3D Engine modifiers.
         inline AZ::u32 TranslateKeyboardModifiers(const Qt::KeyboardModifiers modifiers)
         {
             AZ::u32 result = 0;
@@ -234,19 +282,19 @@ namespace AzToolsFramework
             return result;
         }
 
-        /// Interface to translate Qt modifiers to Open 3D Engine modifiers.
+        //! Interface to translate Qt modifiers to Open 3D Engine modifiers.
         inline KeyboardModifiers BuildKeyboardModifiers(const Qt::KeyboardModifiers modifiers)
         {
             return KeyboardModifiers(TranslateKeyboardModifiers(modifiers));
         }
 
-        /// Interface to translate Qt buttons to Open 3D Engine buttons.
+        //! Interface to translate Qt buttons to Open 3D Engine buttons.
         inline MouseButtons BuildMouseButtons(const Qt::MouseButtons buttons)
         {
             return MouseButtons(TranslateMouseButtons(buttons));
         }
 
-        /// Generate mouse buttons from single button enum.
+        //! Generate mouse buttons from single button enum.
         inline MouseButtons MouseButtonsFromButton(MouseButton button)
         {
             MouseButtons mouseButtons;
@@ -254,7 +302,7 @@ namespace AzToolsFramework
             return mouseButtons;
         }
 
-        /// Reflect all viewport related types.
+        //! Reflect all viewport related types.
         void ViewportInteractionReflect(AZ::ReflectContext* context);
     } // namespace ViewportInteraction
 } // namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorDefaultSelection.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorDefaultSelection.cpp
index a7f500cc5f..ed776f90ea 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorDefaultSelection.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorDefaultSelection.cpp
@@ -1,14 +1,14 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
 #include "EditorDefaultSelection.h"
 
@@ -30,8 +30,7 @@ namespace AzToolsFramework
         ActionOverrideRequestBus::Handler::BusConnect(GetEntityContextId());
         ComponentModeFramework::ComponentModeSystemRequestBus::Handler::BusConnect();
 
-        m_manipulatorManager =
-            AZStd::make_shared<AzToolsFramework::ManipulatorManager>(AzToolsFramework::g_mainManipulatorManagerId);
+        m_manipulatorManager = AZStd::make_shared<AzToolsFramework::ManipulatorManager>(AzToolsFramework::g_mainManipulatorManagerId);
         m_transformComponentSelection = AZStd::make_unique<EditorTransformComponentSelection>(entityDataCache);
     }
 
@@ -75,23 +74,18 @@ namespace AzToolsFramework
         for (const auto& componentModeBuilder : entityAndComponentModeBuilders.m_componentModeBuilders)
         {
             m_componentModeCollection.AddComponentMode(
-                AZ::EntityComponentIdPair(
-                    entityAndComponentModeBuilders.m_entityId, componentModeBuilder.m_componentId),
-                componentModeBuilder.m_componentType,
-                componentModeBuilder.m_componentModeBuilder);
+                AZ::EntityComponentIdPair(entityAndComponentModeBuilders.m_entityId, componentModeBuilder.m_componentId),
+                componentModeBuilder.m_componentType, componentModeBuilder.m_componentModeBuilder);
         }
     }
 
     void EditorDefaultSelection::TransitionToComponentMode()
     {
         // entering ComponentMode - disable all default actions in the ActionManager
-        EditorActionRequestBus::Broadcast(
-            &EditorActionRequests::DisableDefaultActions);
+        EditorActionRequestBus::Broadcast(&EditorActionRequests::DisableDefaultActions);
 
         // attach widget to store ComponentMode specific actions
-        EditorActionRequestBus::Broadcast(
-            &EditorActionRequests::AttachOverride,
-            &PhantomWidget());
+        EditorActionRequestBus::Broadcast(&EditorActionRequests::AttachOverride, &PhantomWidget());
 
         if (m_transformComponentSelection)
         {
@@ -103,8 +97,7 @@ namespace AzToolsFramework
 
         // refresh button ui
         ToolsApplicationEvents::Bus::Broadcast(
-            &ToolsApplicationEvents::Bus::Events::InvalidatePropertyDisplay,
-            PropertyModificationRefreshLevel::Refresh_EntireTree);
+            &ToolsApplicationEvents::Bus::Events::InvalidatePropertyDisplay, PropertyModificationRefreshLevel::Refresh_EntireTree);
     }
 
     void EditorDefaultSelection::TransitionFromComponentMode()
@@ -117,19 +110,16 @@ namespace AzToolsFramework
             m_transformComponentSelection->RegisterManipulator();
         }
 
-        EditorActionRequestBus::Broadcast(
-            &EditorActionRequests::DetachOverride);
+        EditorActionRequestBus::Broadcast(&EditorActionRequests::DetachOverride);
 
         ClearActionOverrides();
 
         // leaving ComponentMode - enable all default actions in ActionManager
-        EditorActionRequestBus::Broadcast(
-            &EditorActionRequests::EnableDefaultActions);
+        EditorActionRequestBus::Broadcast(&EditorActionRequests::EnableDefaultActions);
 
         // refresh button ui
         ToolsApplicationEvents::Bus::Broadcast(
-            &ToolsApplicationEvents::Bus::Events::InvalidatePropertyDisplay,
-            PropertyModificationRefreshLevel::Refresh_EntireTree);
+            &ToolsApplicationEvents::Bus::Events::InvalidatePropertyDisplay, PropertyModificationRefreshLevel::Refresh_EntireTree);
     }
 
     void EditorDefaultSelection::EndComponentMode()
@@ -142,8 +132,7 @@ namespace AzToolsFramework
         m_componentModeCollection.Refresh(entityComponentIdPair);
     }
 
-    bool EditorDefaultSelection::AddedToComponentMode(
-        const AZ::EntityComponentIdPair& entityComponentIdPair, const AZ::Uuid& componentType)
+    bool EditorDefaultSelection::AddedToComponentMode(const AZ::EntityComponentIdPair& entityComponentIdPair, const AZ::Uuid& componentType)
     {
         return m_componentModeCollection.AddedToComponentMode(entityComponentIdPair, componentType);
     }
@@ -152,10 +141,10 @@ namespace AzToolsFramework
     {
         ComponentModeFramework::ComponentModeDelegateRequestBus::EnumerateHandlers(
             [componentType](ComponentModeFramework::ComponentModeDelegateRequestBus::InterfaceType* componentModeMouseRequests)
-        {
-            componentModeMouseRequests->AddComponentModeOfType(componentType);
-            return true;
-        });
+            {
+                componentModeMouseRequests->AddComponentModeOfType(componentType);
+                return true;
+            });
 
         TransitionToComponentMode();
     }
@@ -238,8 +227,7 @@ namespace AzToolsFramework
         }
     }
 
-    bool EditorDefaultSelection::InternalHandleMouseViewportInteraction(
-        const ViewportInteraction::MouseInteractionEvent& mouseInteraction)
+    bool EditorDefaultSelection::InternalHandleMouseViewportInteraction(const ViewportInteraction::MouseInteractionEvent& mouseInteraction)
     {
         bool enterComponentModeAttempted = false;
         const bool componentModeBefore = InComponentMode();
@@ -249,15 +237,15 @@ namespace AzToolsFramework
         {
             // enumerate all ComponentModeDelegateRequestBus and check if any triggered AddComponentModes
             ComponentModeFramework::ComponentModeDelegateRequestBus::EnumerateHandlers(
-                [&mouseInteraction, &enterComponentModeAttempted]
-                (ComponentModeFramework::ComponentModeDelegateRequestBus::InterfaceType* componentModeMouseRequests)
-            {
-                // detect if a double click happened on any Component in the viewport, attempting
-                // to move it into ComponentMode (note: this is not guaranteed to succeed as an
-                // incompatible multi-selection may prevent it)
-                enterComponentModeAttempted = componentModeMouseRequests->DetectEnterComponentModeInteraction(mouseInteraction);
-                return !enterComponentModeAttempted;
-            });
+                [&mouseInteraction, &enterComponentModeAttempted](
+                    ComponentModeFramework::ComponentModeDelegateRequestBus::InterfaceType* componentModeMouseRequests)
+                {
+                    // detect if a double click happened on any Component in the viewport, attempting
+                    // to move it into ComponentMode (note: this is not guaranteed to succeed as an
+                    // incompatible multi-selection may prevent it)
+                    enterComponentModeAttempted = componentModeMouseRequests->DetectEnterComponentModeInteraction(mouseInteraction);
+                    return !enterComponentModeAttempted;
+                });
 
             // here we know ComponentMode was entered successfully and was not prohibited
             if (m_componentModeCollection.ModesAdded())
@@ -272,25 +260,24 @@ namespace AzToolsFramework
         else
         {
             ComponentModeFramework::ComponentModeRequestBus::EnumerateHandlers(
-                [&mouseInteraction, &handled]
-                (ComponentModeFramework::ComponentModeRequestBus::InterfaceType* componentModeRequest)
-            {
-                if (componentModeRequest->HandleMouseInteraction(mouseInteraction))
+                [&mouseInteraction, &handled](ComponentModeFramework::ComponentModeRequestBus::InterfaceType* componentModeRequest)
                 {
-                    handled = true;
-                }
+                    if (componentModeRequest->HandleMouseInteraction(mouseInteraction))
+                    {
+                        handled = true;
+                    }
 
-                return true;
-            });
+                    return true;
+                });
 
             if (!handled)
             {
                 ComponentModeFramework::ComponentModeDelegateRequestBus::EnumerateHandlers(
-                    [&mouseInteraction]
-                    (ComponentModeFramework::ComponentModeDelegateRequestBus::InterfaceType* componentModeDelegateRequests)
-                {
-                    return !componentModeDelegateRequests->DetectLeaveComponentModeInteraction(mouseInteraction);
-                });
+                    [&mouseInteraction](
+                        ComponentModeFramework::ComponentModeDelegateRequestBus::InterfaceType* componentModeDelegateRequests)
+                    {
+                        return !componentModeDelegateRequests->DetectLeaveComponentModeInteraction(mouseInteraction);
+                    });
             }
         }
 
@@ -311,8 +298,7 @@ namespace AzToolsFramework
     }
 
     void EditorDefaultSelection::DisplayViewportSelection(
-        const AzFramework::ViewportInfo& viewportInfo,
-        AzFramework::DebugDisplayRequests& debugDisplay)
+        const AzFramework::ViewportInfo& viewportInfo, AzFramework::DebugDisplayRequests& debugDisplay)
     {
         if (m_transformComponentSelection)
         {
@@ -330,8 +316,7 @@ namespace AzToolsFramework
     }
 
     void EditorDefaultSelection::DisplayViewportSelection2d(
-        const AzFramework::ViewportInfo& viewportInfo,
-        AzFramework::DebugDisplayRequests& debugDisplay)
+        const AzFramework::ViewportInfo& viewportInfo, AzFramework::DebugDisplayRequests& debugDisplay)
     {
         if (m_transformComponentSelection)
         {
@@ -355,11 +340,12 @@ namespace AzToolsFramework
     void EditorDefaultSelection::AddActionOverride(const ActionOverride& actionOverride)
     {
         // check if an action with this uri is already added
-        const auto actionIt = AZStd::find_if(m_actions.begin(), m_actions.end(),
+        const auto actionIt = AZStd::find_if(
+            m_actions.begin(), m_actions.end(),
             [actionOverride](const AZStd::shared_ptr<ActionOverrideMapping>& actionOverrideMapping)
-        {
-            return actionOverride.m_uri == actionOverrideMapping->m_uri;
-        });
+            {
+                return actionOverride.m_uri == actionOverrideMapping->m_uri;
+            });
 
         // if an action with the same uri is already added, store the callback for this action
         if (actionIt != m_actions.end())
@@ -381,44 +367,45 @@ namespace AzToolsFramework
 
             // set callbacks that should happen when this action is triggered
             auto index = static_cast<int>(m_actions.size());
-            QObject::connect(action.get(), &QAction::triggered, [this, index]()
-            {
-                const auto vec = m_actions; // increment ref count of shared_ptr, callback may clear actions
-                for (auto& callback : vec[index]->m_callbacks)
+            QObject::connect(
+                action.get(), &QAction::triggered,
+                [this, index]()
                 {
-                    callback();
-                }
-            });
+                    const auto vec = m_actions; // increment ref count of shared_ptr, callback may clear actions
+                    for (auto& callback : vec[index]->m_callbacks)
+                    {
+                        callback();
+                    }
+                });
 
-            m_actions.emplace_back(
-                AZStd::make_shared<ActionOverrideMapping>(
-                    actionOverride.m_uri, AZStd::vector<AZStd::function<void()>>{ actionOverride.m_callback },
-                    AZStd::move(action)));
+            m_actions.emplace_back(AZStd::make_shared<ActionOverrideMapping>(
+                actionOverride.m_uri, AZStd::vector<AZStd::function<void()>>{ actionOverride.m_callback }, AZStd::move(action)));
 
             // register action with edit menu
-            EditorMenuRequestBus::Broadcast(
-                &EditorMenuRequests::AddEditMenuAction, m_actions.back()->m_action.get());
+            EditorMenuRequestBus::Broadcast(&EditorMenuRequests::AddEditMenuAction, m_actions.back()->m_action.get());
         }
     }
 
     void EditorDefaultSelection::ClearActionOverrides()
     {
-        AZStd::for_each(m_actions.begin(), m_actions.end(),
+        AZStd::for_each(
+            m_actions.begin(), m_actions.end(),
             [this](const AZStd::shared_ptr<ActionOverrideMapping>& actionMapping)
-        {
-            PhantomWidget().removeAction(actionMapping->m_action.get());
-        });
+            {
+                PhantomWidget().removeAction(actionMapping->m_action.get());
+            });
 
         m_actions.clear();
     }
 
     void EditorDefaultSelection::RemoveActionOverride(const AZ::Crc32 actionOverrideUri)
     {
-        const auto it = AZStd::find_if(m_actions.begin(), m_actions.end(),
+        const auto it = AZStd::find_if(
+            m_actions.begin(), m_actions.end(),
             [actionOverrideUri](const AZStd::shared_ptr<ActionOverrideMapping>& actionMapping)
-        {
-            return actionMapping->m_uri == actionOverrideUri;
-        });
+            {
+                return actionMapping->m_uri == actionOverrideUri;
+            });
 
         if (it != m_actions.end())
         {
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorDefaultSelection.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorDefaultSelection.h
index 414e163e2f..d2f2c2fea5 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorDefaultSelection.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorDefaultSelection.h
@@ -1,14 +1,14 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
 #pragma once
 
@@ -19,7 +19,7 @@
 
 namespace AzToolsFramework
 {
-    /// The default selection/input handler for the editor (includes handling ComponentMode).
+    //! The default selection/input handler for the editor (includes handling ComponentMode).
     class EditorDefaultSelection
         : public ViewportInteraction::InternalViewportSelectionRequests
         , private ActionOverrideRequestBus::Handler
@@ -28,30 +28,26 @@ namespace AzToolsFramework
     public:
         AZ_CLASS_ALLOCATOR_DECL
 
-        /// @cond
+        //! @cond
         explicit EditorDefaultSelection(const EditorVisibleEntityDataCache* entityDataCache);
         EditorDefaultSelection(const EditorDefaultSelection&) = delete;
         EditorDefaultSelection& operator=(const EditorDefaultSelection&) = delete;
         virtual ~EditorDefaultSelection();
-        /// @endcond
+        //! @endcond
 
-        /// Override the default widget used to store QActions while in ComponentMode.
-        /// @note This should not be necessary during normal operation and is provided
-        /// as a customization point to aid with testing.
+        //! Override the default widget used to store QActions while in ComponentMode.
+        //! @note This should not be necessary during normal operation and is provided
+        //! as a customization point to aid with testing.
         void SetOverridePhantomWidget(QWidget* phantomOverrideWidget);
 
     private:
         // ViewportInteraction::InternalMouseViewportRequests ...
-        bool InternalHandleMouseViewportInteraction(
-            const ViewportInteraction::MouseInteractionEvent& mouseInteraction) override;
-        bool InternalHandleMouseManipulatorInteraction(
-            const ViewportInteraction::MouseInteractionEvent& mouseInteraction) override;
+        bool InternalHandleMouseViewportInteraction(const ViewportInteraction::MouseInteractionEvent& mouseInteraction) override;
+        bool InternalHandleMouseManipulatorInteraction(const ViewportInteraction::MouseInteractionEvent& mouseInteraction) override;
         void DisplayViewportSelection(
-            const AzFramework::ViewportInfo& viewportInfo,
-            AzFramework::DebugDisplayRequests& debugDisplay) override;
+            const AzFramework::ViewportInfo& viewportInfo, AzFramework::DebugDisplayRequests& debugDisplay) override;
         void DisplayViewportSelection2d(
-            const AzFramework::ViewportInfo& viewportInfo,
-            AzFramework::DebugDisplayRequests& debugDisplay) override;
+            const AzFramework::ViewportInfo& viewportInfo, AzFramework::DebugDisplayRequests& debugDisplay) override;
 
         // ActionOverrideRequestBus ...
         void SetupActionOverrideHandler(QWidget* parent) override;
@@ -65,7 +61,10 @@ namespace AzToolsFramework
             const AZStd::vector<ComponentModeFramework::EntityAndComponentModeBuilders>& entityAndComponentModeBuilders) override;
         void AddComponentModes(const ComponentModeFramework::EntityAndComponentModeBuilders& entityAndComponentModeBuilders) override;
         void EndComponentMode() override;
-        bool InComponentMode() override { return m_componentModeCollection.InComponentMode(); }
+        bool InComponentMode() override
+        {
+            return m_componentModeCollection.InComponentMode();
+        }
         void Refresh(const AZ::EntityComponentIdPair& entityComponentIdPair) override;
         bool AddedToComponentMode(const AZ::EntityComponentIdPair& entityComponentIdPair, const AZ::Uuid& componentType) override;
         void AddSelectedComponentModesOfType(const AZ::Uuid& componentType) override;
@@ -77,41 +76,43 @@ namespace AzToolsFramework
         bool HasMultipleComponentTypes() override;
         void RefreshActions() override;
 
-        /// Helpers to deal with moving in and out of ComponentMode.
+        //! Helpers to deal with moving in and out of ComponentMode.
         void TransitionToComponentMode();
         void TransitionFromComponentMode();
 
-        /// Accessor used internally to refer to the phantom widget.
-        /// This will either be the default widget or the override if non-null.
+        //! Accessor used internally to refer to the phantom widget.
+        //! This will either be the default widget or the override if non-null.
         QWidget& PhantomWidget();
 
-        QWidget m_phantomWidget; ///< The phantom widget responsible for holding QActions while in ComponentMode.
-        QWidget* m_phantomOverrideWidget = nullptr; ///< It's possible to override the phantom widget in special circumstances (eg testing).
-        ComponentModeFramework::ComponentModeCollection m_componentModeCollection; ///< Handles all active ComponentMode types.
-        AZStd::unique_ptr<EditorTransformComponentSelection> m_transformComponentSelection = nullptr; ///< Viewport selection (responsible for
-                                                                                                      ///< manipulators and transform modifications).
-        const EditorVisibleEntityDataCache* m_entityDataCache = nullptr; ///< Reference to cached visible EntityData.
+        QWidget m_phantomWidget; //!< The phantom widget responsible for holding QActions while in ComponentMode.
+        QWidget* m_phantomOverrideWidget = nullptr; //!< It's possible to override the phantom widget in special circumstances (eg testing).
+        ComponentModeFramework::ComponentModeCollection m_componentModeCollection; //!< Handles all active ComponentMode types.
+        AZStd::unique_ptr<EditorTransformComponentSelection> m_transformComponentSelection =
+            nullptr; //!< Viewport selection (responsible for
+                     //!< manipulators and transform modifications).
+        const EditorVisibleEntityDataCache* m_entityDataCache = nullptr; //!< Reference to cached visible EntityData.
 
-        /// Mapping between passed ActionOverride (AddActionOverride) and allocated QAction.
+        //! Mapping between passed ActionOverride (AddActionOverride) and allocated QAction.
         struct ActionOverrideMapping
         {
             ActionOverrideMapping(
-                const AZ::Crc32 uri, const AZStd::vector<AZStd::function<void()>>& callbacks,
-                AZStd::unique_ptr<QAction> action)
+                const AZ::Crc32 uri, const AZStd::vector<AZStd::function<void()>>& callbacks, AZStd::unique_ptr<QAction> action)
                 : m_uri(uri)
                 , m_callbacks(callbacks)
-                , m_action(AZStd::move(action)) {}
+                , m_action(AZStd::move(action))
+            {
+            }
 
-            AZ::Crc32 m_uri; ///< Unique identifier for the Action. (In the form 'com.amazon.action.---").
-            AZStd::vector<AZStd::function<void()>> m_callbacks; ///< Callbacks associated with this Action (note: with multi-selections there
-                                                                ///< will be a callback per Entity/Component).
-            AZStd::unique_ptr<QAction> m_action; ///< The QAction associated with the overrideWidget for all ComponentMode actions.
+            AZ::Crc32 m_uri; //!< Unique identifier for the Action. (In the form 'com.amazon.action.---").
+            AZStd::vector<AZStd::function<void()>> m_callbacks; //!< Callbacks associated with this Action (note: with multi-selections
+                                                                //!< there will be a callback per Entity/Component).
+            AZStd::unique_ptr<QAction> m_action; //!< The QAction associated with the overrideWidget for all ComponentMode actions.
         };
 
-        AZStd::vector<AZStd::shared_ptr<ActionOverrideMapping>> m_actions; ///< Currently bound actions (corresponding to those set
-                                                                           ///< on the override widget).
+        AZStd::vector<AZStd::shared_ptr<ActionOverrideMapping>> m_actions; //!< Currently bound actions (corresponding to those set
+                                                                           //!< on the override widget).
 
-        AZStd::shared_ptr<AzToolsFramework::ManipulatorManager> m_manipulatorManager; ///< The default manipulator manager.
-        ViewportInteraction::MouseInteraction m_currentInteraction; ///< Current mouse interaction to be used for drawing manipulators.
+        AZStd::shared_ptr<AzToolsFramework::ManipulatorManager> m_manipulatorManager; //!< The default manipulator manager.
+        ViewportInteraction::MouseInteraction m_currentInteraction; //!< Current mouse interaction to be used for drawing manipulators.
     };
 } // namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorHelpers.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorHelpers.cpp
index 31da01fadc..6080f6f7ae 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorHelpers.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorHelpers.cpp
@@ -1,14 +1,14 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
 #include "EditorHelpers.h"
 
@@ -16,21 +16,33 @@
 #include <AzFramework/Entity/EntityDebugDisplayBus.h>
 #include <AzFramework/Viewport/CameraState.h>
 #include <AzFramework/Visibility/BoundsBus.h>
+#include <AzToolsFramework/API/EditorViewportIconDisplayInterface.h>
 #include <AzToolsFramework/ToolsComponents/EditorEntityIconComponentBus.h>
 #include <AzToolsFramework/Viewport/ViewportMessages.h>
 #include <AzToolsFramework/Viewport/ViewportTypes.h>
-#include <AzToolsFramework/ViewportSelection/EditorVisibleEntityDataCache.h>
 #include <AzToolsFramework/ViewportSelection/EditorSelectionUtil.h>
-#include <AzToolsFramework/API/EditorViewportIconDisplayInterface.h>
+#include <AzToolsFramework/ViewportSelection/EditorVisibleEntityDataCache.h>
 
 AZ_CVAR(
-    bool, ed_visibility_showAggregateEntitySelectionBounds, false, nullptr, AZ::ConsoleFunctorFlags::Null,
+    bool,
+    ed_visibility_showAggregateEntitySelectionBounds,
+    false,
+    nullptr,
+    AZ::ConsoleFunctorFlags::Null,
     "Display the aggregate selection bounds for a given entity (the union of all component Aabbs)");
 AZ_CVAR(
-    bool, ed_visibility_showAggregateEntityTransformedLocalBounds, false, nullptr, AZ::ConsoleFunctorFlags::Null,
+    bool,
+    ed_visibility_showAggregateEntityTransformedLocalBounds,
+    false,
+    nullptr,
+    AZ::ConsoleFunctorFlags::Null,
     "Display the aggregate transformed local bounds for a given entity (the union of all local component Aabbs)");
 AZ_CVAR(
-    bool, ed_visibility_showAggregateEntityWorldBounds, false, nullptr, AZ::ConsoleFunctorFlags::Null,
+    bool,
+    ed_visibility_showAggregateEntityWorldBounds,
+    false,
+    nullptr,
+    AZ::ConsoleFunctorFlags::Null,
     "Display the aggregate world bounds for a given entity (the union of all world component Aabbs)");
 
 namespace AzToolsFramework
@@ -48,8 +60,7 @@ namespace AzToolsFramework
     static bool HelpersVisible()
     {
         bool helpersVisible = false;
-        EditorRequestBus::BroadcastResult(
-            helpersVisible, &EditorRequests::DisplayHelpersVisible);
+        EditorRequestBus::BroadcastResult(helpersVisible, &EditorRequests::DisplayHelpersVisible);
         return helpersVisible;
     }
 
@@ -59,25 +70,23 @@ namespace AzToolsFramework
     {
         AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
 
-        return s_iconMinScale + (s_iconMaxScale - s_iconMinScale) *
+        return s_iconMinScale +
+            (s_iconMaxScale - s_iconMinScale) *
             (1.0f - AZ::GetClamp(AZ::GetMax(0.0f, sqrtf(distSq) - s_iconCloseDist) / s_iconFarDist, 0.0f, 1.0f));
     }
 
     static void DisplayComponents(
-        const AZ::EntityId entityId, const AzFramework::ViewportInfo& viewportInfo,
-        AzFramework::DebugDisplayRequests& debugDisplay)
+        const AZ::EntityId entityId, const AzFramework::ViewportInfo& viewportInfo, AzFramework::DebugDisplayRequests& debugDisplay)
     {
         AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
 
         const AZ::Entity* entity = AZ::Interface<AZ::ComponentApplicationRequests>::Get()->FindEntity(entityId);
         AzFramework::EntityDebugDisplayEventBus::Event(
-            entityId, &AzFramework::EntityDebugDisplayEvents::DisplayEntityViewport,
-            viewportInfo, debugDisplay);
+            entityId, &AzFramework::EntityDebugDisplayEvents::DisplayEntityViewport, viewportInfo, debugDisplay);
 
         if (ed_visibility_showAggregateEntitySelectionBounds)
         {
-            if (const AZ::Aabb aabb = AzToolsFramework::CalculateEditorEntitySelectionBounds(entityId, viewportInfo);
-                aabb.IsValid())
+            if (const AZ::Aabb aabb = AzToolsFramework::CalculateEditorEntitySelectionBounds(entityId, viewportInfo); aabb.IsValid())
             {
                 debugDisplay.SetColor(AZ::Colors::Orange);
                 debugDisplay.DrawWireBox(aabb.GetMin(), aabb.GetMax());
@@ -107,8 +116,7 @@ namespace AzToolsFramework
     }
 
     AZ::EntityId EditorHelpers::HandleMouseInteraction(
-        const AzFramework::CameraState& cameraState,
-        const ViewportInteraction::MouseInteractionEvent& mouseInteraction)
+        const AzFramework::CameraState& cameraState, const ViewportInteraction::MouseInteractionEvent& mouseInteraction)
     {
         AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
 
@@ -127,8 +135,7 @@ namespace AzToolsFramework
         {
             const AZ::EntityId entityId = m_entityDataCache->GetVisibleEntityId(entityCacheIndex);
 
-            if (    m_entityDataCache->IsVisibleEntityLocked(entityCacheIndex)
-                || !m_entityDataCache->IsVisibleEntityVisible(entityCacheIndex))
+            if (m_entityDataCache->IsVisibleEntityLocked(entityCacheIndex) || !m_entityDataCache->IsVisibleEntityVisible(entityCacheIndex))
             {
                 continue;
             }
@@ -148,10 +155,8 @@ namespace AzToolsFramework
                     const auto iconRange = static_cast<float>(GetIconScale(distSqFromCamera) * s_iconSize * 0.5f);
                     const auto screenCoords = mouseInteraction.m_mouseInteraction.m_mousePick.m_screenCoordinates;
 
-                    if (    screenCoords.m_x >= screenPosition.m_x - iconRange
-                        &&  screenCoords.m_x <= screenPosition.m_x + iconRange
-                        &&  screenCoords.m_y >= screenPosition.m_y - iconRange
-                        &&  screenCoords.m_y <= screenPosition.m_y + iconRange)
+                    if (screenCoords.m_x >= screenPosition.m_x - iconRange && screenCoords.m_x <= screenPosition.m_x + iconRange &&
+                        screenCoords.m_y >= screenPosition.m_y - iconRange && screenCoords.m_y <= screenPosition.m_y + iconRange)
                     {
                         entityIdUnderCursor = entityId;
                         break;
@@ -161,16 +166,13 @@ namespace AzToolsFramework
 
             using AzFramework::ViewportInfo;
             // check if components provide an aabb
-            if (const AZ::Aabb aabb = CalculateEditorEntitySelectionBounds(entityId, ViewportInfo{viewportId});
-                aabb.IsValid())
+            if (const AZ::Aabb aabb = CalculateEditorEntitySelectionBounds(entityId, ViewportInfo{ viewportId }); aabb.IsValid())
             {
                 // coarse grain check
                 if (AabbIntersectMouseRay(mouseInteraction.m_mouseInteraction, aabb))
                 {
                     // if success, pick against specific component
-                    if (PickEntity(
-                        entityId, mouseInteraction.m_mouseInteraction,
-                        closestDistance, viewportId))
+                    if (PickEntity(entityId, mouseInteraction.m_mouseInteraction, closestDistance, viewportId))
                     {
                         entityIdUnderCursor = entityId;
                     }
@@ -182,7 +184,8 @@ namespace AzToolsFramework
     }
 
     void EditorHelpers::DisplayHelpers(
-        const AzFramework::ViewportInfo& viewportInfo, const AzFramework::CameraState& cameraState,
+        const AzFramework::ViewportInfo& viewportInfo,
+        const AzFramework::CameraState& cameraState,
         AzFramework::DebugDisplayRequests& debugDisplay,
         const AZStd::function<bool(AZ::EntityId)>& showIconCheck)
     {
@@ -202,8 +205,8 @@ namespace AzToolsFramework
                 // notify components to display
                 DisplayComponents(entityId, viewportInfo, debugDisplay);
 
-                if (    m_entityDataCache->IsVisibleEntityIconHidden(entityCacheIndex)
-                    || (m_entityDataCache->IsVisibleEntitySelected(entityCacheIndex) && !showIconCheck(entityId)))
+                if (m_entityDataCache->IsVisibleEntityIconHidden(entityCacheIndex) ||
+                    (m_entityDataCache->IsVisibleEntitySelected(entityCacheIndex) && !showIconCheck(entityId)))
                 {
                     continue;
                 }
@@ -219,7 +222,8 @@ namespace AzToolsFramework
                 const float iconSize = s_iconSize * iconScale;
 
                 using ComponentEntityAccentType = Components::EditorSelectionAccentSystemComponent::ComponentEntityAccentType;
-                const AZ::Color iconHighlight = [this, entityCacheIndex]() {
+                const AZ::Color iconHighlight = [this, entityCacheIndex]()
+                {
                     if (m_entityDataCache->IsVisibleEntityLocked(entityCacheIndex))
                     {
                         return AZ::Color(AZ::u8(100), AZ::u8(100), AZ::u8(100), AZ::u8(255));
@@ -233,14 +237,9 @@ namespace AzToolsFramework
                     return AZ::Color(1.0f, 1.0f, 1.0f, 1.0f);
                 }();
 
-                EditorViewportIconDisplay::Get()->DrawIcon({
-                    viewportInfo.m_viewportId,
-                    iconTextureId,
-                    iconHighlight,
-                    entityPosition,
-                    EditorViewportIconDisplayInterface::CoordinateSpace::WorldSpace,
-                    AZ::Vector2{iconSize, iconSize}
-                });
+                EditorViewportIconDisplay::Get()->DrawIcon({ viewportInfo.m_viewportId, iconTextureId, iconHighlight, entityPosition,
+                                                             EditorViewportIconDisplayInterface::CoordinateSpace::WorldSpace,
+                                                             AZ::Vector2{ iconSize, iconSize } });
             }
         }
     }
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorHelpers.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorHelpers.h
index e36203e31d..926cadee34 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorHelpers.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorHelpers.h
@@ -1,14 +1,14 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
 #pragma once
 
@@ -21,7 +21,7 @@ namespace AzFramework
     class DebugDisplayRequests;
     struct ViewportInfo;
     struct CameraState;
-}
+} // namespace AzFramework
 
 namespace AzToolsFramework
 {
@@ -32,37 +32,39 @@ namespace AzToolsFramework
         struct MouseInteractionEvent;
     }
 
-    /// EditorHelpers are the visualizations that appear for entities
-    /// when 'Display Helpers' is toggled on inside the editor.
-    /// These include but are not limited to entity icons and shape visualizations.
+    //! EditorHelpers are the visualizations that appear for entities
+    //! when 'Display Helpers' is toggled on inside the editor.
+    //! These include but are not limited to entity icons and shape visualizations.
     class EditorHelpers
     {
     public:
         AZ_CLASS_ALLOCATOR_DECL
 
-        /// An EditorVisibleEntityDataCache must be passed to EditorHelpers to allow it to
-        /// efficiently read entity data without resorting to EBus calls.
+        //! An EditorVisibleEntityDataCache must be passed to EditorHelpers to allow it to
+        //! efficiently read entity data without resorting to EBus calls.
         explicit EditorHelpers(const EditorVisibleEntityDataCache* entityDataCache)
-            : m_entityDataCache(entityDataCache) {}
+            : m_entityDataCache(entityDataCache)
+        {
+        }
         EditorHelpers(const EditorHelpers&) = delete;
         EditorHelpers& operator=(const EditorHelpers&) = delete;
         ~EditorHelpers() = default;
 
-        /// Handle any mouse interaction with the EditorHelpers.
-        /// Used to check if a particular entity was selected.
+        //! Handle any mouse interaction with the EditorHelpers.
+        //! Used to check if a particular entity was selected.
         AZ::EntityId HandleMouseInteraction(
-            const AzFramework::CameraState& cameraState,
-            const ViewportInteraction::MouseInteractionEvent& mouseInteraction);
+            const AzFramework::CameraState& cameraState, const ViewportInteraction::MouseInteractionEvent& mouseInteraction);
 
-        /// Do the drawing responsible for the EditorHelpers.
-        /// @param showIconCheck Provide a custom callback to filter certain entities from
-        /// displaying an icon under certain conditions.
+        //! Do the drawing responsible for the EditorHelpers.
+        //! @param showIconCheck Provide a custom callback to filter certain entities from
+        //! displaying an icon under certain conditions.
         void DisplayHelpers(
-            const AzFramework::ViewportInfo& viewportInfo, const AzFramework::CameraState& cameraState,
+            const AzFramework::ViewportInfo& viewportInfo,
+            const AzFramework::CameraState& cameraState,
             AzFramework::DebugDisplayRequests& debugDisplay,
             const AZStd::function<bool(AZ::EntityId)>& showIconCheck);
 
     private:
-        const EditorVisibleEntityDataCache* m_entityDataCache = nullptr; ///< Entity Data queried by the EditorHelpers.
+        const EditorVisibleEntityDataCache* m_entityDataCache = nullptr; //!< Entity Data queried by the EditorHelpers.
     };
 } // namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorInteractionSystemComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorInteractionSystemComponent.cpp
index 12f10e9784..578e113aaf 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorInteractionSystemComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorInteractionSystemComponent.cpp
@@ -1,14 +1,14 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
 #include "EditorInteractionSystemComponent.h"
 
@@ -45,8 +45,7 @@ namespace AzToolsFramework
         return m_interactionRequests->InternalHandleMouseManipulatorInteraction(mouseInteraction);
     }
 
-    void EditorInteractionSystemComponent::SetHandler(
-        const ViewportSelectionRequestsBuilderFn& interactionRequestsBuilder)
+    void EditorInteractionSystemComponent::SetHandler(const ViewportSelectionRequestsBuilderFn& interactionRequestsBuilder)
     {
         // when setting a handler, make sure we're connected to the ViewportDebugDisplayEventBus so we
         // can forward calls to the specific type implementing ViewportSelectionRequests
@@ -57,32 +56,30 @@ namespace AzToolsFramework
 
         m_entityDataCache = AZStd::make_unique<EditorVisibleEntityDataCache>();
 
-        m_interactionRequests.reset(); // BusConnect/Disconnect in constructor/destructor, 
+        m_interactionRequests.reset(); // BusConnect/Disconnect in constructor/destructor,
                                        // so have to reset before assigning the new one
         m_interactionRequests = interactionRequestsBuilder(m_entityDataCache.get());
     }
 
     void EditorInteractionSystemComponent::SetDefaultHandler()
     {
-        SetHandler([](const EditorVisibleEntityDataCache* entityDataCache)
-        {
-            return AZStd::make_unique<EditorDefaultSelection>(entityDataCache);
-        });
+        SetHandler(
+            [](const EditorVisibleEntityDataCache* entityDataCache)
+            {
+                return AZStd::make_unique<EditorDefaultSelection>(entityDataCache);
+            });
     }
 
     void EditorInteractionSystemComponent::Reflect(AZ::ReflectContext* context)
     {
         if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
         {
-            serializeContext->Class<EditorInteractionSystemComponent, AZ::Component>()
-                ->Version(0)
-                ;
+            serializeContext->Class<EditorInteractionSystemComponent, AZ::Component>()->Version(0);
         }
     }
 
     void EditorInteractionSystemComponent::DisplayViewport(
-        const AzFramework::ViewportInfo& viewportInfo,
-        AzFramework::DebugDisplayRequests& debugDisplay)
+        const AzFramework::ViewportInfo& viewportInfo, AzFramework::DebugDisplayRequests& debugDisplay)
     {
         AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
 
@@ -93,8 +90,7 @@ namespace AzToolsFramework
     }
 
     void EditorInteractionSystemComponent::DisplayViewport2d(
-        const AzFramework::ViewportInfo& viewportInfo,
-        AzFramework::DebugDisplayRequests& debugDisplay)
+        const AzFramework::ViewportInfo& viewportInfo, AzFramework::DebugDisplayRequests& debugDisplay)
     {
         m_interactionRequests->DisplayViewportSelection2d(viewportInfo, debugDisplay);
     }
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorInteractionSystemComponent.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorInteractionSystemComponent.h
index 2205add970..8fba5c923d 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorInteractionSystemComponent.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorInteractionSystemComponent.h
@@ -1,14 +1,14 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
 #pragma once
 
@@ -18,9 +18,9 @@
 
 namespace AzToolsFramework
 {
-    /// System Component to wrap active input handler.
-    /// EditorInteractionSystemComponent is notified of viewport mouse events from RenderViewport
-    /// and forwards them to a concrete implementation of ViewportSelectionRequests.
+    //! System Component to wrap active input handler.
+    //! EditorInteractionSystemComponent is notified of viewport mouse events from RenderViewport
+    //! and forwards them to a concrete implementation of ViewportSelectionRequests.
     class EditorInteractionSystemComponent
         : public AZ::Component
         , private EditorInteractionSystemViewportSelectionRequestBus::Handler
@@ -37,18 +37,12 @@ namespace AzToolsFramework
         void SetDefaultHandler() override;
 
         // EditorInteractionSystemViewportSelectionRequestBus ...
-        bool InternalHandleMouseViewportInteraction(
-            const ViewportInteraction::MouseInteractionEvent& mouseInteraction) override;
-        bool InternalHandleMouseManipulatorInteraction(
-            const ViewportInteraction::MouseInteractionEvent& mouseInteraction) override;
+        bool InternalHandleMouseViewportInteraction(const ViewportInteraction::MouseInteractionEvent& mouseInteraction) override;
+        bool InternalHandleMouseManipulatorInteraction(const ViewportInteraction::MouseInteractionEvent& mouseInteraction) override;
 
         // AzFramework::ViewportDebugDisplayEventBus
-        void DisplayViewport(
-            const AzFramework::ViewportInfo& viewportInfo,
-            AzFramework::DebugDisplayRequests& debugDisplay) override;
-        void DisplayViewport2d(
-            const AzFramework::ViewportInfo& viewportInfo,
-            AzFramework::DebugDisplayRequests& debugDisplay) override;
+        void DisplayViewport(const AzFramework::ViewportInfo& viewportInfo, AzFramework::DebugDisplayRequests& debugDisplay) override;
+        void DisplayViewport2d(const AzFramework::ViewportInfo& viewportInfo, AzFramework::DebugDisplayRequests& debugDisplay) override;
 
     private:
         // AZ::Component
@@ -58,11 +52,11 @@ namespace AzToolsFramework
         // EditorEventsBus
         void NotifyCentralWidgetInitialized() override;
 
-        AZStd::unique_ptr<EditorVisibleEntityDataCache> m_entityDataCache = nullptr; ///< Visible EntityData cache to be used by concrete
-                                                                                     ///< instantiations of ViewportSelectionRequests.
+        AZStd::unique_ptr<EditorVisibleEntityDataCache> m_entityDataCache = nullptr; //!< Visible EntityData cache to be used by concrete
+                                                                                     //!< instantiations of ViewportSelectionRequests.
 
-        AZStd::unique_ptr<InternalViewportSelectionRequests> m_interactionRequests; ///< Hold a concrete implementation of
-                                                                                    ///< ViewportSelectionRequests to handle viewport
-                                                                                    ///< input and drawing for the Editor.
+        AZStd::unique_ptr<InternalViewportSelectionRequests> m_interactionRequests; //!< Hold a concrete implementation of
+                                                                                    //!< ViewportSelectionRequests to handle viewport
+                                                                                    //!< input and drawing for the Editor.
     };
 } // namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorInteractionSystemViewportSelectionRequestBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorInteractionSystemViewportSelectionRequestBus.h
index 09135069d8..184fa29aa0 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorInteractionSystemViewportSelectionRequestBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorInteractionSystemViewportSelectionRequestBus.h
@@ -1,14 +1,14 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
 #pragma once
 
@@ -22,10 +22,9 @@ namespace AzToolsFramework
 {
     class EditorVisibleEntityDataCache;
 
-    /// Bus to handle all mouse events originating from the viewport.
-    /// Coordinated by the EditorInteractionSystemComponent
-    class EditorInteractionSystemViewportSelectionRequests
-        : public AZ::EBusTraits
+    //! Bus to handle all mouse events originating from the viewport.
+    //! Coordinated by the EditorInteractionSystemComponent
+    class EditorInteractionSystemViewportSelectionRequests : public AZ::EBusTraits
     {
     public:
         using BusIdType = AzFramework::EntityContextId;
@@ -36,32 +35,31 @@ namespace AzToolsFramework
         ~EditorInteractionSystemViewportSelectionRequests() = default;
     };
 
-    /// Alias for factory function to create a new type implementing the ViewportSelectionRequests interface.
+    //! Alias for factory function to create a new type implementing the ViewportSelectionRequests interface.
     using ViewportSelectionRequestsBuilderFn =
         AZStd::function<AZStd::unique_ptr<ViewportInteraction::InternalViewportSelectionRequests>(const EditorVisibleEntityDataCache*)>;
 
-    /// Interface for system component implementing the ViewportSelectionRequests interface.
-    /// This interface also includes a setter to set a custom handler also implementing
-    /// the ViewportSelectionRequests interface to customize editor behavior.
-    class EditorInteractionSystemViewportSelection
-        : public ViewportInteraction::InternalViewportSelectionRequests
+    //! Interface for system component implementing the ViewportSelectionRequests interface.
+    //! This interface also includes a setter to set a custom handler also implementing
+    //! the ViewportSelectionRequests interface to customize editor behavior.
+    class EditorInteractionSystemViewportSelection : public ViewportInteraction::InternalViewportSelectionRequests
     {
     public:
-        /// \ref SetHandler takes a factory function to create a new type implementing
-        /// the ViewportSelectionRequests interface.
-        /// It provides a handler implementing ViewportSelectionRequests to handle all
-        /// viewport mouse input and drawing.
+        //! \ref SetHandler takes a factory function to create a new type implementing
+        //! the ViewportSelectionRequests interface.
+        //! It provides a handler implementing ViewportSelectionRequests to handle all
+        //! viewport mouse input and drawing.
         virtual void SetHandler(const ViewportSelectionRequestsBuilderFn& interactionRequestsBuilder) = 0;
-        /// \ref SetDefaultHandler is a utility function to set the
-        /// default editor handler (currently \ref EditorDefaultSelection).
-        /// This is useful to call after setting another mode and then wishing
-        /// to return to normal operation of the editor.
+        //! \ref SetDefaultHandler is a utility function to set the
+        //! default editor handler (currently \ref EditorDefaultSelection).
+        //! This is useful to call after setting another mode and then wishing
+        //! to return to normal operation of the editor.
         virtual void SetDefaultHandler() = 0;
     };
 
-    /// Type to inherit to implement EditorInteractionSystemViewportSelection.
-    /// @note Called by viewport events (RenderViewport) and then handled by concrete
-    /// implementation of InternalViewportSelectionRequests.
+    //! Type to inherit to implement EditorInteractionSystemViewportSelection.
+    //! @note Called by viewport events (RenderViewport) and then handled by concrete
+    //! implementation of InternalViewportSelectionRequests.
     using EditorInteractionSystemViewportSelectionRequestBus =
         AZ::EBus<EditorInteractionSystemViewportSelection, EditorInteractionSystemViewportSelectionRequests>;
 
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorPickEntitySelection.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorPickEntitySelection.cpp
index 1be8ee927b..e026c1f9e0 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorPickEntitySelection.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorPickEntitySelection.cpp
@@ -1,14 +1,14 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
 #include "EditorPickEntitySelection.h"
 
@@ -19,9 +19,8 @@ namespace AzToolsFramework
 {
     AZ_CLASS_ALLOCATOR_IMPL(EditorPickEntitySelection, AZ::SystemAllocator, 0)
 
-    EditorPickEntitySelection::EditorPickEntitySelection(
-        const EditorVisibleEntityDataCache* entityDataCache)
-            : m_editorHelpers(AZStd::make_unique<EditorHelpers>(entityDataCache))
+    EditorPickEntitySelection::EditorPickEntitySelection(const EditorVisibleEntityDataCache* entityDataCache)
+        : m_editorHelpers(AZStd::make_unique<EditorHelpers>(entityDataCache))
     {
     }
 
@@ -29,8 +28,7 @@ namespace AzToolsFramework
     {
         if (m_hoveredEntityId.IsValid())
         {
-            ToolsApplicationRequestBus::Broadcast(
-                &ToolsApplicationRequests::SetEntityHighlighted, m_hoveredEntityId, false);
+            ToolsApplicationRequestBus::Broadcast(&ToolsApplicationRequests::SetEntityHighlighted, m_hoveredEntityId, false);
         }
     }
 
@@ -41,8 +39,7 @@ namespace AzToolsFramework
     // highlighted - hoveredEntityId is an in/out param that is updated based on the change in
     // entityIdUnderCursor.
     static void HandleAccents(
-        const AZ::EntityId entityIdUnderCursor, AZ::EntityId& hoveredEntityId,
-        const ViewportInteraction::MouseButtons mouseButtons)
+        const AZ::EntityId entityIdUnderCursor, AZ::EntityId& hoveredEntityId, const ViewportInteraction::MouseButtons mouseButtons)
     {
         AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
 
@@ -55,8 +52,7 @@ namespace AzToolsFramework
         {
             if (hoveredEntityId.IsValid())
             {
-                ToolsApplicationRequestBus::Broadcast(
-                    &ToolsApplicationRequests::SetEntityHighlighted, hoveredEntityId, false);
+                ToolsApplicationRequestBus::Broadcast(&ToolsApplicationRequests::SetEntityHighlighted, hoveredEntityId, false);
 
                 hoveredEntityId.SetInvalid();
             }
@@ -68,8 +64,7 @@ namespace AzToolsFramework
         {
             if (entityIdUnderCursor.IsValid() && entityIdUnderCursor != hoveredEntityId)
             {
-                ToolsApplicationRequestBus::Broadcast(
-                    &ToolsApplicationRequests::SetEntityHighlighted, entityIdUnderCursor, true);
+                ToolsApplicationRequestBus::Broadcast(&ToolsApplicationRequests::SetEntityHighlighted, entityIdUnderCursor, true);
 
                 hoveredEntityId = entityIdUnderCursor;
             }
@@ -93,8 +88,7 @@ namespace AzToolsFramework
             if (m_cachedEntityIdUnderCursor.IsValid())
             {
                 // if we clicked on a valid entity id, actually try to set it
-                EditorPickModeRequestBus::Broadcast(
-                    &EditorPickModeRequests::PickModeSelectEntity, m_cachedEntityIdUnderCursor);
+                EditorPickModeRequestBus::Broadcast(&EditorPickModeRequests::PickModeSelectEntity, m_cachedEntityIdUnderCursor);
             }
 
             // after a click, always stop pick mode, whether we set an entity or not
@@ -105,16 +99,18 @@ namespace AzToolsFramework
     }
 
     void EditorPickEntitySelection::DisplayViewportSelection(
-        const AzFramework::ViewportInfo& viewportInfo,
-        AzFramework::DebugDisplayRequests& debugDisplay)
+        const AzFramework::ViewportInfo& viewportInfo, AzFramework::DebugDisplayRequests& debugDisplay)
     {
         const AzFramework::CameraState cameraState = GetCameraState(viewportInfo.m_viewportId);
 
         m_editorHelpers->DisplayHelpers(
-            viewportInfo, cameraState, debugDisplay, [](AZ::EntityId){ return true; });
+            viewportInfo, cameraState, debugDisplay,
+            [](AZ::EntityId)
+            {
+                return true;
+            });
 
         HandleAccents(
-            m_cachedEntityIdUnderCursor, m_hoveredEntityId,
-            ViewportInteraction::BuildMouseButtons(QGuiApplication::mouseButtons()));
+            m_cachedEntityIdUnderCursor, m_hoveredEntityId, ViewportInteraction::BuildMouseButtons(QGuiApplication::mouseButtons()));
     }
 } // namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorPickEntitySelection.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorPickEntitySelection.h
index 07aafe2607..2c956e1534 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorPickEntitySelection.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorPickEntitySelection.h
@@ -1,14 +1,14 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
 #pragma once
 
@@ -17,10 +17,9 @@
 
 namespace AzToolsFramework
 {
-    /// Viewport interaction that will handle assigning an entity in the viewport to
-    /// an entity field in the entity inspector.
-    class EditorPickEntitySelection
-        : public ViewportInteraction::InternalViewportSelectionRequests
+    //! Viewport interaction that will handle assigning an entity in the viewport to
+    //! an entity field in the entity inspector.
+    class EditorPickEntitySelection : public ViewportInteraction::InternalViewportSelectionRequests
     {
     public:
         AZ_CLASS_ALLOCATOR_DECL
@@ -30,15 +29,12 @@ namespace AzToolsFramework
 
     private:
         // ViewportInteraction::InternalViewportSelectionRequests ...
-        bool InternalHandleMouseViewportInteraction(
-            const ViewportInteraction::MouseInteractionEvent& mouseInteraction) override;
+        bool InternalHandleMouseViewportInteraction(const ViewportInteraction::MouseInteractionEvent& mouseInteraction) override;
         void DisplayViewportSelection(
-            const AzFramework::ViewportInfo& viewportInfo,
-            AzFramework::DebugDisplayRequests& debugDisplay) override;
+            const AzFramework::ViewportInfo& viewportInfo, AzFramework::DebugDisplayRequests& debugDisplay) override;
 
-        AZStd::unique_ptr<EditorHelpers> m_editorHelpers; ///< Editor visualization of entities (icons, shapes, debug visuals etc).
-
-        AZ::EntityId m_hoveredEntityId; ///< What EntityId is the mouse currently hovering over (if any).
-        AZ::EntityId m_cachedEntityIdUnderCursor; ///< Store the EntityId on each mouse move for use in Display.
+        AZStd::unique_ptr<EditorHelpers> m_editorHelpers; //!< Editor visualization of entities (icons, shapes, debug visuals etc).
+        AZ::EntityId m_hoveredEntityId; //!< What EntityId is the mouse currently hovering over (if any).
+        AZ::EntityId m_cachedEntityIdUnderCursor; //!< Store the EntityId on each mouse move for use in Display.
     };
 } // namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorSelectionUtil.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorSelectionUtil.cpp
index d0143c5517..7856c159ab 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorSelectionUtil.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorSelectionUtil.cpp
@@ -1,38 +1,36 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
 #include "EditorSelectionUtil.h"
 
-#include <AzCore/Math/Aabb.h>
-#include <AzCore/Interface/Interface.h>
-#include <AzCore/Math/IntersectSegment.h>
 #include <AzCore/Component/ComponentApplicationBus.h>
+#include <AzCore/Interface/Interface.h>
+#include <AzCore/Math/Aabb.h>
+#include <AzCore/Math/IntersectSegment.h>
 #include <AzFramework/Visibility/BoundsBus.h>
 #include <AzToolsFramework/API/ComponentEntitySelectionBus.h>
 #include <AzToolsFramework/Viewport/ViewportMessages.h>
 
 namespace AzToolsFramework
 {
-    /// Default ray length for picking in the viewport.
+    // default ray length for picking in the viewport
     static const float s_pickRayLength = 1000.0f;
 
-    AZ::Vector3 CalculateCenterOffset(
-        const AZ::EntityId entityId, const EditorTransformComponentSelectionRequests::Pivot pivot)
+    AZ::Vector3 CalculateCenterOffset(const AZ::EntityId entityId, const EditorTransformComponentSelectionRequests::Pivot pivot)
     {
         if (Centered(pivot))
         {
             const AZ::Entity* entity = AZ::Interface<AZ::ComponentApplicationRequests>::Get()->FindEntity(entityId);
-            if (const AZ::Aabb localBound = AzFramework::CalculateEntityLocalBoundsUnion(entity);
-                localBound.IsValid())
+            if (const AZ::Aabb localBound = AzFramework::CalculateEntityLocalBoundsUnion(entity); localBound.IsValid())
             {
                 return localBound.GetCenter();
             }
@@ -41,76 +39,71 @@ namespace AzToolsFramework
         return AZ::Vector3::CreateZero();
     }
 
-    float CalculateScreenToWorldMultiplier(
-        const AZ::Vector3& worldPosition, const AzFramework::CameraState& cameraState)
+    float CalculateScreenToWorldMultiplier(const AZ::Vector3& worldPosition, const AzFramework::CameraState& cameraState)
     {
         const float apparentDistance = 10.0f;
 
         // compute the distance from the camera, projected onto the camera's forward direction
         // note: this keeps the scale value the same when positions are at the edge of the screen
-        const float projectedCameraDistance =
-            std::abs((cameraState.m_position - worldPosition).Dot(cameraState.m_forward));
+        const float projectedCameraDistance = std::abs((cameraState.m_position - worldPosition).Dot(cameraState.m_forward));
 
         // author sizes of bounds/manipulators as they would appear
         // in perspective 10 meters from the camera.
         return AZ::GetMax(projectedCameraDistance, cameraState.m_nearClip) / apparentDistance;
     }
 
-     AzFramework::ScreenPoint GetScreenPosition(const int viewportId, const AZ::Vector3& worldTranslation)
+    AzFramework::ScreenPoint GetScreenPosition(const int viewportId, const AZ::Vector3& worldTranslation)
     {
         AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
 
         auto screenPosition = AzFramework::ScreenPoint(0, 0);
         ViewportInteraction::ViewportInteractionRequestBus::EventResult(
-            screenPosition, viewportId,
-            &ViewportInteraction::ViewportInteractionRequestBus::Events::ViewportWorldToScreen,
+            screenPosition, viewportId, &ViewportInteraction::ViewportInteractionRequestBus::Events::ViewportWorldToScreen,
             worldTranslation);
 
         return screenPosition;
     }
 
-    bool AabbIntersectMouseRay(
-        const ViewportInteraction::MouseInteraction& mouseInteraction, const AZ::Aabb& aabb)
+    bool AabbIntersectMouseRay(const ViewportInteraction::MouseInteraction& mouseInteraction, const AZ::Aabb& aabb)
     {
         AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
 
-        const AZ::Vector3 rayScaledDir =
-            mouseInteraction.m_mousePick.m_rayDirection * s_pickRayLength;
+        const AZ::Vector3 rayScaledDir = mouseInteraction.m_mousePick.m_rayDirection * s_pickRayLength;
 
         AZ::Vector3 startNormal;
         float t, end;
         return AZ::Intersect::IntersectRayAABB(
-            mouseInteraction.m_mousePick.m_rayOrigin, rayScaledDir,
-            rayScaledDir.GetReciprocal(), aabb, t, end, startNormal) > 0;
+                   mouseInteraction.m_mousePick.m_rayOrigin, rayScaledDir, rayScaledDir.GetReciprocal(), aabb, t, end, startNormal) > 0;
     }
 
     bool PickEntity(
-        const AZ::EntityId entityId, const ViewportInteraction::MouseInteraction& mouseInteraction,
-        float& closestDistance, const int viewportId)
+        const AZ::EntityId entityId,
+        const ViewportInteraction::MouseInteraction& mouseInteraction,
+        float& closestDistance,
+        const int viewportId)
     {
         AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Entity);
 
         bool entityPicked = false;
         EditorComponentSelectionRequestsBus::EnumerateHandlersId(
-            entityId, [mouseInteraction, &entityPicked, &closestDistance, viewportId]
-            (EditorComponentSelectionRequests* handler) -> bool
-        {
-            if (handler->SupportsEditorRayIntersect())
+            entityId,
+            [mouseInteraction, &entityPicked, &closestDistance, viewportId](EditorComponentSelectionRequests* handler) -> bool
             {
-                float distance = std::numeric_limits<float>::max();
-                const bool intersection = handler->EditorSelectionIntersectRayViewport(
-                    { viewportId }, mouseInteraction.m_mousePick.m_rayOrigin,
-                    mouseInteraction.m_mousePick.m_rayDirection, distance);
-
-                if (intersection && distance < closestDistance)
+                if (handler->SupportsEditorRayIntersect())
                 {
-                    entityPicked = true;
-                    closestDistance = distance;
-                }
-            }
+                    float distance = std::numeric_limits<float>::max();
+                    const bool intersection = handler->EditorSelectionIntersectRayViewport(
+                        { viewportId }, mouseInteraction.m_mousePick.m_rayOrigin, mouseInteraction.m_mousePick.m_rayDirection, distance);
 
-            return true; // iterate over all handlers
-        });
+                    if (intersection && distance < closestDistance)
+                    {
+                        entityPicked = true;
+                        closestDistance = distance;
+                    }
+                }
+
+                return true; // iterate over all handlers
+            });
 
         return entityPicked;
     }
@@ -119,9 +112,8 @@ namespace AzToolsFramework
     {
         AzFramework::CameraState cameraState;
         ViewportInteraction::ViewportInteractionRequestBus::EventResult(
-            cameraState, viewportId,
-            &ViewportInteraction::ViewportInteractionRequestBus::Events::GetCameraState);
-        
+            cameraState, viewportId, &ViewportInteraction::ViewportInteractionRequestBus::Events::GetCameraState);
+
         return cameraState;
     }
 
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorSelectionUtil.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorSelectionUtil.h
index e904277078..a7c6368d65 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorSelectionUtil.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorSelectionUtil.h
@@ -1,14 +1,14 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
 #pragma once
 
@@ -30,56 +30,53 @@ namespace AzFramework
 
 namespace AzToolsFramework
 {
-    /// Is the pivot at the center of the object (middle of extents) or at the
-    /// exported authored object root position.
+    //! Is the pivot at the center of the object (middle of extents) or at the
+    //! exported authored object root position.
     inline bool Centered(const EditorTransformComponentSelectionRequests::Pivot pivot)
     {
         return pivot == EditorTransformComponentSelectionRequests::Pivot::Center;
     }
 
-    /// Return offset from object pivot to center if center is true, otherwise Vector3::Zero.
+    //! Return offset from object pivot to center if center is true, otherwise Vector3::Zero.
     AZ::Vector3 CalculateCenterOffset(AZ::EntityId entityId, EditorTransformComponentSelectionRequests::Pivot pivot);
 
-    /// Calculate scale factor based on distance from camera
-    float CalculateScreenToWorldMultiplier(
-        const AZ::Vector3& worldPosition, const AzFramework::CameraState& cameraState);
+    //! Calculate scale factor based on distance from camera
+    float CalculateScreenToWorldMultiplier(const AZ::Vector3& worldPosition, const AzFramework::CameraState& cameraState);
 
-    /// Map from world space to screen space.
-     AzFramework::ScreenPoint GetScreenPosition(int viewportId, const AZ::Vector3& worldTranslation);
+    //! Map from world space to screen space.
+    AzFramework::ScreenPoint GetScreenPosition(int viewportId, const AZ::Vector3& worldTranslation);
 
-    /// Given a mouse interaction, determine if the pick ray from its position
-    /// in screen space intersected an aabb in world space.
-    bool AabbIntersectMouseRay(
-        const ViewportInteraction::MouseInteraction& mouseInteraction, const AZ::Aabb& aabb);
+    //! Given a mouse interaction, determine if the pick ray from its position
+    //! in screen space intersected an aabb in world space.
+    bool AabbIntersectMouseRay(const ViewportInteraction::MouseInteraction& mouseInteraction, const AZ::Aabb& aabb);
 
-    /// Return if a mouse interaction (pick ray) did intersect the tested EntityId.
+    //! Return if a mouse interaction (pick ray) did intersect the tested EntityId.
     bool PickEntity(
-        AZ::EntityId entityId, const ViewportInteraction::MouseInteraction& mouseInteraction,
-        float& closestDistance, int viewportId);
+        AZ::EntityId entityId, const ViewportInteraction::MouseInteraction& mouseInteraction, float& closestDistance, int viewportId);
 
-    /// Wrapper for EBus call to return the CameraState for a given viewport.
+    //! Wrapper for EBus call to return the CameraState for a given viewport.
     AzFramework::CameraState GetCameraState(int viewportId);
 
-    /// Wrapper for EBus call to return the DPI scaling for a given viewport.
-    float GetScreenDisplayScaling(const int viewportId);
+    //! Wrapper for EBus call to return the DPI scaling for a given viewport.
+    float GetScreenDisplayScaling(int viewportId);
 
-    /// A utility to return the center of several points.
-    /// Take several positions and store the min and max of each in
-    /// turn - when all points have been added return the center/midpoint.
+    //! A utility to return the center of several points.
+    //! Take several positions and store the min and max of each in
+    //! turn - when all points have been added return the center/midpoint.
     class MidpointCalculator
     {
     public:
-        /// Default constructed with min and max initialized to opposites.
+        //! Default constructed with min and max initialized to opposites.
         MidpointCalculator() = default;
 
-        /// Call this for all positions you want to be considered.
+        //! Call this for all positions you want to be considered.
         void AddPosition(const AZ::Vector3& position)
         {
             m_minPosition = position.GetMin(m_minPosition);
             m_maxPosition = position.GetMax(m_maxPosition);
         }
 
-        /// Once all positions have been added, call this to return the midpoint.
+        //! Once all positions have been added, call this to return the midpoint.
         AZ::Vector3 CalculateMidpoint() const
         {
             return m_minPosition + (m_maxPosition - m_minPosition) * 0.5f;
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp
index db321d6818..eadb870563 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp
@@ -1,29 +1,30 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
 #include "EditorTransformComponentSelection.h"
 
-#include <AzCore/std/algorithm.h>
 #include <AzCore/Math/Matrix3x3.h>
 #include <AzCore/Math/Matrix3x4.h>
 #include <AzCore/Math/Matrix4x4.h>
 #include <AzCore/Math/VectorConversions.h>
+#include <AzCore/std/algorithm.h>
 #include <AzFramework/API/ApplicationAPI.h>
 #include <AzFramework/Viewport/CameraState.h>
 #include <AzFramework/Viewport/ViewportColors.h>
 #include <AzFramework/Viewport/ViewportScreen.h>
-#include <AzToolsFramework/Entity/EditorEntityTransformBus.h>
+#include <AzQtComponents/Components/Style.h>
 #include <AzToolsFramework/Commands/EntityManipulatorCommand.h>
 #include <AzToolsFramework/Commands/SelectionCommand.h>
+#include <AzToolsFramework/Entity/EditorEntityTransformBus.h>
 #include <AzToolsFramework/Manipulators/ManipulatorManager.h>
 #include <AzToolsFramework/Manipulators/ManipulatorSnapping.h>
 #include <AzToolsFramework/Manipulators/RotationManipulators.h>
@@ -36,7 +37,6 @@
 #include <AzToolsFramework/Viewport/ActionBus.h>
 #include <AzToolsFramework/ViewportSelection/EditorSelectionUtil.h>
 #include <AzToolsFramework/ViewportSelection/EditorVisibleEntityDataCache.h>
-#include <AzQtComponents/Components/Style.h>
 #include <Entity/EditorEntityContextBus.h>
 #include <Entity/EditorEntityHelpers.h>
 #include <QApplication>
@@ -47,20 +47,40 @@ namespace AzToolsFramework
     AZ_CLASS_ALLOCATOR_IMPL(EditorTransformComponentSelection, AZ::SystemAllocator, 0)
 
     AZ_CVAR(
-        float, cl_viewportGizmoAxisLineWidth, 4.0f, nullptr, AZ::ConsoleFunctorFlags::Null,
+        float,
+        cl_viewportGizmoAxisLineWidth,
+        4.0f,
+        nullptr,
+        AZ::ConsoleFunctorFlags::Null,
         "The width of the line for the viewport axis gizmo");
     AZ_CVAR(
-        float, cl_viewportGizmoAxisLineLength, 0.7f, nullptr, AZ::ConsoleFunctorFlags::Null,
+        float,
+        cl_viewportGizmoAxisLineLength,
+        0.7f,
+        nullptr,
+        AZ::ConsoleFunctorFlags::Null,
         "The length of the line for the viewport axis gizmo");
     AZ_CVAR(
-        float, cl_viewportGizmoAxisLabelOffset, 1.15f, nullptr, AZ::ConsoleFunctorFlags::Null,
+        float,
+        cl_viewportGizmoAxisLabelOffset,
+        1.15f,
+        nullptr,
+        AZ::ConsoleFunctorFlags::Null,
         "The offset of the label for the viewport axis gizmo");
     AZ_CVAR(
-        float, cl_viewportGizmoAxisLabelSize, 1.0f, nullptr, AZ::ConsoleFunctorFlags::Null,
+        float,
+        cl_viewportGizmoAxisLabelSize,
+        1.0f,
+        nullptr,
+        AZ::ConsoleFunctorFlags::Null,
         "The size of each label for the viewport axis gizmo");
     AZ_CVAR(
-        AZ::Vector2, cl_viewportGizmoAxisScreenPosition, AZ::Vector2(0.045f, 0.9f), nullptr,
-        AZ::ConsoleFunctorFlags::Null, "The screen position of the gizmo in normalized (0-1) ndc space");
+        AZ::Vector2,
+        cl_viewportGizmoAxisScreenPosition,
+        AZ::Vector2(0.045f, 0.9f),
+        nullptr,
+        AZ::ConsoleFunctorFlags::Null,
+        "The screen position of the gizmo in normalized (0-1) ndc space");
 
     // strings related to new viewport interaction model (EditorTransformComponentSelection)
     static const char* const s_togglePivotTitleRightClick = "Toggle pivot";
@@ -125,7 +145,8 @@ namespace AzToolsFramework
 
     static const int s_defaultViewportId = 0;
 
-    static const float s_pivotSize = 0.075f; ///< The size of the pivot (box) to render when selected.
+    static const float s_pivotSize = 0.075f; // the size of the pivot (box) to render when selected
+
     // data passed to manipulators when processing mouse interactions
     // m_entityIds should be sorted based on the entity hierarchy
     // (see SortEntitiesByLocationInHierarchy and BuildSortedEntityIdVectorFromEntityIdContainer)
@@ -146,8 +167,7 @@ namespace AzToolsFramework
 
     bool OptionalFrame::HasTransformOverride() const
     {
-        return  m_translationOverride.has_value()
-            || m_orientationOverride.has_value();
+        return m_translationOverride.has_value() || m_orientationOverride.has_value();
     }
 
     bool OptionalFrame::HasEntityOverride() const
@@ -226,7 +246,7 @@ namespace AzToolsFramework
             return mouseInteraction.m_mouseInteraction.m_mouseButtons.Middle() &&
                 mouseInteraction.m_mouseEvent == ViewportInteraction::MouseEvent::Down &&
                 (mouseInteraction.m_mouseInteraction.m_keyboardModifiers.Alt() ||
-                    mouseInteraction.m_mouseInteraction.m_keyboardModifiers.Ctrl());
+                 mouseInteraction.m_mouseInteraction.m_keyboardModifiers.Ctrl());
         }
 
         static bool ManipulatorDitto(const ViewportInteraction::MouseInteractionEvent& mouseInteraction)
@@ -263,8 +283,7 @@ namespace AzToolsFramework
         }
     }
 
-    static EditorTransformComponentSelectionRequests::Pivot TogglePivotMode(
-        const EditorTransformComponentSelectionRequests::Pivot pivot)
+    static EditorTransformComponentSelectionRequests::Pivot TogglePivotMode(const EditorTransformComponentSelectionRequests::Pivot pivot)
     {
         switch (pivot)
         {
@@ -282,8 +301,7 @@ namespace AzToolsFramework
     template<typename EntityIdContainer>
     static AZStd::vector<AZ::EntityId> EntityIdVectorFromContainer(const EntityIdContainer& entityIdContainer)
     {
-        static_assert(AZStd::is_same<typename EntityIdContainer::value_type, AZ::EntityId>::value,
-            "Container type is not an EntityId");
+        static_assert(AZStd::is_same<typename EntityIdContainer::value_type, AZ::EntityId>::value, "Container type is not an EntityId");
 
         AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
         return AZStd::vector<AZ::EntityId>(entityIdContainer.begin(), entityIdContainer.end());
@@ -293,8 +311,7 @@ namespace AzToolsFramework
     template<typename EntityIdMap>
     static AZStd::vector<AZ::EntityId> EntityIdVectorFromMap(const EntityIdMap& entityIdMap)
     {
-        static_assert(AZStd::is_same<typename EntityIdMap::key_type, AZ::EntityId>::value,
-            "Container key type is not an EntityId");
+        static_assert(AZStd::is_same<typename EntityIdMap::key_type, AZ::EntityId>::value, "Container key type is not an EntityId");
 
         AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
 
@@ -318,10 +335,15 @@ namespace AzToolsFramework
 
     template<typename EntitySelectFuncType, typename EntityIdContainer, typename Compare>
     static void BoxSelectAddRemoveToEntitySelection(
-        const AZStd::optional<QRect>& boxSelect, const AzFramework::ScreenPoint& screenPosition, const AZ::EntityId visibleEntityId,
-        const EntityIdContainer& incomingEntityIds, EntityIdContainer& outgoingEntityIds,
+        const AZStd::optional<QRect>& boxSelect,
+        const AzFramework::ScreenPoint& screenPosition,
+        const AZ::EntityId visibleEntityId,
+        const EntityIdContainer& incomingEntityIds,
+        EntityIdContainer& outgoingEntityIds,
         EditorTransformComponentSelection& entityTransformComponentSelection,
-        EntitySelectFuncType selectFunc1, EntitySelectFuncType selectFunc2, Compare outgoingCheck)
+        EntitySelectFuncType selectFunc1,
+        EntitySelectFuncType selectFunc2,
+        Compare outgoingCheck)
     {
         AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
 
@@ -349,10 +371,14 @@ namespace AzToolsFramework
 
     template<typename EntityIdContainer>
     static void EntityBoxSelectUpdateGeneral(
-        const AZStd::optional<QRect>& boxSelect, EditorTransformComponentSelection& editorTransformComponentSelection,
-        const EntityIdContainer& activeSelectedEntityIds, EntityIdContainer& selectedEntityIdsBeforeBoxSelect,
-        EntityIdContainer& potentialSelectedEntityIds, EntityIdContainer& potentialDeselectedEntityIds,
-        const EditorVisibleEntityDataCache& entityDataCache, const int viewportId,
+        const AZStd::optional<QRect>& boxSelect,
+        EditorTransformComponentSelection& editorTransformComponentSelection,
+        const EntityIdContainer& activeSelectedEntityIds,
+        EntityIdContainer& selectedEntityIdsBeforeBoxSelect,
+        EntityIdContainer& potentialSelectedEntityIds,
+        EntityIdContainer& potentialDeselectedEntityIds,
+        const EditorVisibleEntityDataCache& entityDataCache,
+        const int viewportId,
         const ViewportInteraction::KeyboardModifiers currentKeyboardModifiers,
         const ViewportInteraction::KeyboardModifiers& previousKeyboardModifiers)
     {
@@ -382,8 +408,7 @@ namespace AzToolsFramework
 
             for (size_t entityCacheIndex = 0; entityCacheIndex < entityDataCache.VisibleEntityDataCount(); ++entityCacheIndex)
             {
-                if (    entityDataCache.IsVisibleEntityLocked(entityCacheIndex)
-                    || !entityDataCache.IsVisibleEntityVisible(entityCacheIndex))
+                if (entityDataCache.IsVisibleEntityLocked(entityCacheIndex) || !entityDataCache.IsVisibleEntityVisible(entityCacheIndex))
                 {
                     continue;
                 }
@@ -396,10 +421,8 @@ namespace AzToolsFramework
                 if (currentKeyboardModifiers.Ctrl())
                 {
                     BoxSelectAddRemoveToEntitySelection(
-                        boxSelect, screenPosition, entityId,
-                        selectedEntityIdsBeforeBoxSelect, potentialDeselectedEntityIds,
-                        editorTransformComponentSelection,
-                        &EditorTransformComponentSelection::RemoveEntityFromSelection,
+                        boxSelect, screenPosition, entityId, selectedEntityIdsBeforeBoxSelect, potentialDeselectedEntityIds,
+                        editorTransformComponentSelection, &EditorTransformComponentSelection::RemoveEntityFromSelection,
                         &EditorTransformComponentSelection::AddEntityToSelection,
                         [](const typename EntityIdContainer::const_iterator entityId, const EntityIdContainer& entityIds)
                         {
@@ -409,10 +432,8 @@ namespace AzToolsFramework
                 else
                 {
                     BoxSelectAddRemoveToEntitySelection(
-                        boxSelect, screenPosition, entityId,
-                        activeSelectedEntityIds, potentialSelectedEntityIds,
-                        editorTransformComponentSelection,
-                        &EditorTransformComponentSelection::AddEntityToSelection,
+                        boxSelect, screenPosition, entityId, activeSelectedEntityIds, potentialSelectedEntityIds,
+                        editorTransformComponentSelection, &EditorTransformComponentSelection::AddEntityToSelection,
                         &EditorTransformComponentSelection::RemoveEntityFromSelection,
                         [](const typename EntityIdContainer::const_iterator entityId, const EntityIdContainer& entityIds)
                         {
@@ -429,62 +450,53 @@ namespace AzToolsFramework
 
         for (auto& entityIdLookup : entityIdManipulators.m_lookups)
         {
-            entityIdLookup.second.m_initial =
-                AZ::Transform::CreateTranslation(GetWorldTranslation(entityIdLookup.first));
+            entityIdLookup.second.m_initial = AZ::Transform::CreateTranslation(GetWorldTranslation(entityIdLookup.first));
         }
     }
 
     static void DestroyCluster(const ViewportUi::ClusterId clusterId)
     {
         ViewportUi::ViewportUiRequestBus::Event(
-            ViewportUi::DefaultViewportId,
-            &ViewportUi::ViewportUiRequestBus::Events::RemoveCluster,
-            clusterId);
+            ViewportUi::DefaultViewportId, &ViewportUi::ViewportUiRequestBus::Events::RemoveCluster, clusterId);
     }
 
     static void SetViewportUiClusterVisible(const ViewportUi::ClusterId clusterId, const bool visible)
     {
         ViewportUi::ViewportUiRequestBus::Event(
-            ViewportUi::DefaultViewportId,
-            &ViewportUi::ViewportUiRequestBus::Events::SetClusterVisible,
-            clusterId, visible);
+            ViewportUi::DefaultViewportId, &ViewportUi::ViewportUiRequestBus::Events::SetClusterVisible, clusterId, visible);
     }
 
     static void SetViewportUiClusterActiveButton(const ViewportUi::ClusterId clusterId, const ViewportUi::ButtonId buttonId)
     {
         ViewportUi::ViewportUiRequestBus::Event(
-            ViewportUi::DefaultViewportId,
-            &ViewportUi::ViewportUiRequestBus::Events::SetClusterActiveButton,
-            clusterId, buttonId);
+            ViewportUi::DefaultViewportId, &ViewportUi::ViewportUiRequestBus::Events::SetClusterActiveButton, clusterId, buttonId);
     }
 
     static ViewportUi::ButtonId RegisterClusterButton(const ViewportUi::ClusterId clusterId, const char* iconName)
     {
         ViewportUi::ButtonId buttonId;
         ViewportUi::ViewportUiRequestBus::EventResult(
-            buttonId, ViewportUi::DefaultViewportId,
-            &ViewportUi::ViewportUiRequestBus::Events::CreateClusterButton,
-            clusterId, AZStd::string::format(":/stylesheet/img/UI20/toolbar/%s.svg", iconName));
+            buttonId, ViewportUi::DefaultViewportId, &ViewportUi::ViewportUiRequestBus::Events::CreateClusterButton, clusterId,
+            AZStd::string::format(":/stylesheet/img/UI20/toolbar/%s.svg", iconName));
 
         return buttonId;
     }
 
     // return either center or entity pivot
-    static AZ::Vector3 CalculatePivotTranslation(
-        const AZ::EntityId entityId, const EditorTransformComponentSelectionRequests::Pivot pivot)
+    static AZ::Vector3 CalculatePivotTranslation(const AZ::EntityId entityId, const EditorTransformComponentSelectionRequests::Pivot pivot)
     {
         AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
 
         AZ::Transform worldFromLocal = AZ::Transform::CreateIdentity();
-        AZ::TransformBus::EventResult(
-            worldFromLocal, entityId, &AZ::TransformBus::Events::GetWorldTM);
+        AZ::TransformBus::EventResult(worldFromLocal, entityId, &AZ::TransformBus::Events::GetWorldTM);
 
         return worldFromLocal.TransformPoint(CalculateCenterOffset(entityId, pivot));
     }
 
     void EditorTransformComponentSelection::UpdateSpaceCluster(const ReferenceFrame referenceFrame)
     {
-        auto buttonIdFromFrameFn = [this](const ReferenceFrame referenceFrame) {         
+        auto buttonIdFromFrameFn = [this](const ReferenceFrame referenceFrame)
+        {
             switch (referenceFrame)
             {
             case ReferenceFrame::Local:
@@ -498,14 +510,13 @@ namespace AzToolsFramework
         };
 
         ViewportUi::ViewportUiRequestBus::Event(
-            ViewportUi::DefaultViewportId, &ViewportUi::ViewportUiRequestBus::Events::SetClusterActiveButton, m_spaceCluster.m_spaceClusterId,
-            buttonIdFromFrameFn(referenceFrame));
+            ViewportUi::DefaultViewportId, &ViewportUi::ViewportUiRequestBus::Events::SetClusterActiveButton,
+            m_spaceCluster.m_spaceClusterId, buttonIdFromFrameFn(referenceFrame));
     }
 
     namespace ETCS
     {
-        PivotOrientationResult CalculatePivotOrientation(
-            const AZ::EntityId entityId, const ReferenceFrame referenceFrame)
+        PivotOrientationResult CalculatePivotOrientation(const AZ::EntityId entityId, const ReferenceFrame referenceFrame)
         {
             AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
 
@@ -515,21 +526,17 @@ namespace AzToolsFramework
             switch (referenceFrame)
             {
             case ReferenceFrame::Local:
-                AZ::TransformBus::EventResult(
-                    result.m_worldOrientation, entityId,
-                    &AZ::TransformBus::Events::GetWorldRotationQuaternion);
+                AZ::TransformBus::EventResult(result.m_worldOrientation, entityId, &AZ::TransformBus::Events::GetWorldRotationQuaternion);
                 break;
             case ReferenceFrame::Parent:
                 {
                     AZ::EntityId parentId;
-                    AZ::TransformBus::EventResult(
-                        parentId, entityId, &AZ::TransformBus::Events::GetParentId);
+                    AZ::TransformBus::EventResult(parentId, entityId, &AZ::TransformBus::Events::GetParentId);
 
                     if (parentId.IsValid())
                     {
                         AZ::TransformBus::EventResult(
-                            result.m_worldOrientation, parentId,
-                            &AZ::TransformBus::Events::GetWorldRotationQuaternion);
+                            result.m_worldOrientation, parentId, &AZ::TransformBus::Events::GetWorldRotationQuaternion);
 
                         result.m_parentId = parentId;
                     }
@@ -559,8 +566,7 @@ namespace AzToolsFramework
         {
             // check if this entity has a parent
             AZ::EntityId parentId;
-            AZ::TransformBus::EventResult(
-                parentId, entityIdLookupIt->first, &AZ::TransformBus::Events::GetParentId);
+            AZ::TransformBus::EventResult(parentId, entityIdLookupIt->first, &AZ::TransformBus::Events::GetParentId);
 
             // if no parent, space will be world, terminate
             if (!parentId.IsValid())
@@ -575,9 +581,7 @@ namespace AzToolsFramework
             if (!commonParentId.IsValid())
             {
                 commonParentId = parentId;
-                AZ::TransformBus::EventResult(
-                    result.m_worldOrientation, parentId,
-                    &AZ::TransformBus::Events::GetWorldRotationQuaternion);
+                AZ::TransformBus::EventResult(result.m_worldOrientation, parentId, &AZ::TransformBus::Events::GetWorldRotationQuaternion);
             }
 
             // if we know we still have a parent in common
@@ -602,8 +606,7 @@ namespace AzToolsFramework
     static AZ::Vector3 CalculatePivotTranslationForEntityIds(
         const EntityIdMap& entityIdMap, const EditorTransformComponentSelectionRequests::Pivot pivot)
     {
-        static_assert(AZStd::is_same<typename EntityIdMap::key_type, AZ::EntityId>::value,
-            "Container key type is not an EntityId");
+        static_assert(AZStd::is_same<typename EntityIdMap::key_type, AZ::EntityId>::value, "Container key type is not an EntityId");
 
         AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
 
@@ -628,11 +631,9 @@ namespace AzToolsFramework
     namespace ETCS
     {
         template<typename EntityIdMap>
-        PivotOrientationResult CalculatePivotOrientationForEntityIds(
-            const EntityIdMap& entityIdMap, const ReferenceFrame referenceFrame)
+        PivotOrientationResult CalculatePivotOrientationForEntityIds(const EntityIdMap& entityIdMap, const ReferenceFrame referenceFrame)
         {
-            static_assert(AZStd::is_same<typename EntityIdMap::key_type, AZ::EntityId>::value,
-                "Container key type is not an EntityId");
+            static_assert(AZStd::is_same<typename EntityIdMap::key_type, AZ::EntityId>::value, "Container key type is not an EntityId");
 
             AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
 
@@ -660,12 +661,11 @@ namespace AzToolsFramework
     {
         template<typename EntityIdMap>
         PivotOrientationResult CalculateSelectionPivotOrientation(
-            const EntityIdMap& entityIdMap, const OptionalFrame& pivotOverrideFrame,
-            const ReferenceFrame referenceFrame)
+            const EntityIdMap& entityIdMap, const OptionalFrame& pivotOverrideFrame, const ReferenceFrame referenceFrame)
         {
-            static_assert(AZStd::is_same<typename EntityIdMap::key_type, AZ::EntityId>::value,
-                "Container key type is not an EntityId");
-            static_assert(AZStd::is_same<typename EntityIdMap::mapped_type, EntityIdManipulatorLookup>::value,
+            static_assert(AZStd::is_same<typename EntityIdMap::key_type, AZ::EntityId>::value, "Container key type is not an EntityId");
+            static_assert(
+                AZStd::is_same<typename EntityIdMap::mapped_type, EntityIdManipulatorLookup>::value,
                 "Container value type is not an EntityIdManipulators::Lookup");
 
             AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
@@ -728,20 +728,16 @@ namespace AzToolsFramework
     {
         AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
 
-        return pivotOverrideFrame.m_translationOverride.value_or(
-            CalculatePivotTranslationForEntityIds(entityIdMap, pivot));
+        return pivotOverrideFrame.m_translationOverride.value_or(CalculatePivotTranslationForEntityIds(entityIdMap, pivot));
     }
 
     template<typename EntityIdMap>
     static AZ::Quaternion RecalculateAverageManipulatorOrientation(
-        const EntityIdMap& entityIdMap,
-        const OptionalFrame& pivotOverrideFrame,
-        const ReferenceFrame referenceFrame)
+        const EntityIdMap& entityIdMap, const OptionalFrame& pivotOverrideFrame, const ReferenceFrame referenceFrame)
     {
         AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
 
-        return ETCS::CalculateSelectionPivotOrientation(
-            entityIdMap, pivotOverrideFrame, referenceFrame).m_worldOrientation;
+        return ETCS::CalculateSelectionPivotOrientation(entityIdMap, pivotOverrideFrame, referenceFrame).m_worldOrientation;
     }
 
     template<typename EntityIdMap>
@@ -756,15 +752,12 @@ namespace AzToolsFramework
         // return final transform, if we have an override for translation use that, otherwise
         // use centered translation of selection
         return AZ::Transform::CreateFromQuaternionAndTranslation(
-            RecalculateAverageManipulatorOrientation(
-                entityIdMap, pivotOverrideFrame, referenceFrame),
-            RecalculateAverageManipulatorTranslation(
-                entityIdMap, pivotOverrideFrame, pivot));
+            RecalculateAverageManipulatorOrientation(entityIdMap, pivotOverrideFrame, referenceFrame),
+            RecalculateAverageManipulatorTranslation(entityIdMap, pivotOverrideFrame, pivot));
     }
 
     template<typename EntityIdMap>
-    static void BuildSortedEntityIdVectorFromEntityIdMap(
-        const EntityIdMap& entityIds, EntityIdList& sortedEntityIdsOut)
+    static void BuildSortedEntityIdVectorFromEntityIdMap(const EntityIdMap& entityIds, EntityIdList& sortedEntityIdsOut)
     {
         sortedEntityIdsOut = EntityIdVectorFromMap(entityIds);
         SortEntitiesByLocationInHierarchy(sortedEntityIdsOut);
@@ -777,8 +770,7 @@ namespace AzToolsFramework
         for (auto& entityIdLookup : entityManipulators.m_lookups)
         {
             AZ::Transform worldFromLocal = AZ::Transform::CreateIdentity();
-            AZ::TransformBus::EventResult(
-                worldFromLocal, entityIdLookup.first, &AZ::TransformBus::Events::GetWorldTM);
+            AZ::TransformBus::EventResult(worldFromLocal, entityIdLookup.first, &AZ::TransformBus::Events::GetWorldTM);
 
             entityIdLookup.second.m_initial = worldFromLocal;
         }
@@ -804,11 +796,13 @@ namespace AzToolsFramework
 
     template<typename Action, typename EntityIdContainer>
     static void UpdateTranslationManipulator(
-        const Action& action, const EntityIdContainer& entityIdContainer,
+        const Action& action,
+        const EntityIdContainer& entityIdContainer,
         EntityIdManipulators& entityIdManipulators,
         OptionalFrame& pivotOverrideFrame,
         ViewportInteraction::KeyboardModifiers& prevModifiers,
-        bool& transformChangedInternally, const AZStd::optional<ReferenceFrame> spaceLock)
+        bool& transformChangedInternally,
+        const AZStd::optional<ReferenceFrame> spaceLock)
     {
         AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
 
@@ -817,8 +811,7 @@ namespace AzToolsFramework
         if (action.m_modifiers.Ctrl())
         {
             // moving with ctrl - setting override
-            pivotOverrideFrame.m_translationOverride =
-                entityIdManipulators.m_manipulators->GetLocalTransform().GetTranslation();
+            pivotOverrideFrame.m_translationOverride = entityIdManipulators.m_manipulators->GetLocalTransform().GetTranslation();
             InitializeTranslationLookup(entityIdManipulators);
         }
         else
@@ -827,8 +820,7 @@ namespace AzToolsFramework
 
             // note: used for parent and world depending on the current reference frame
             const auto pivotOrientation =
-                ETCS::CalculateSelectionPivotOrientation(
-                    entityIdManipulators.m_lookups, pivotOverrideFrame, referenceFrame);
+                ETCS::CalculateSelectionPivotOrientation(entityIdManipulators.m_lookups, pivotOverrideFrame, referenceFrame);
 
             // note: must use sorted entityIds based on hierarchy order when updating transforms
             for (AZ::EntityId entityId : entityIdContainer)
@@ -847,46 +839,37 @@ namespace AzToolsFramework
                     {
                         // move in each entities local space at once
                         AZ::Quaternion worldOrientation = AZ::Quaternion::CreateIdentity();
-                        AZ::TransformBus::EventResult(
-                            worldOrientation, entityId, &AZ::TransformBus::Events::GetWorldRotationQuaternion);
+                        AZ::TransformBus::EventResult(worldOrientation, entityId, &AZ::TransformBus::Events::GetWorldRotationQuaternion);
 
-                        const AZ::Transform space =
-                            entityIdManipulators.m_manipulators->GetLocalTransform().GetInverse() *
-                            AZ::Transform::CreateFromQuaternionAndTranslation(
-                                worldOrientation, worldTranslation);
+                        const AZ::Transform space = entityIdManipulators.m_manipulators->GetLocalTransform().GetInverse() *
+                            AZ::Transform::CreateFromQuaternionAndTranslation(worldOrientation, worldTranslation);
 
-                    const AZ::Vector3 localOffset = space.TransformVector(action.LocalPositionOffset());
+                        const AZ::Vector3 localOffset = space.TransformVector(action.LocalPositionOffset());
 
                         if (action.m_modifiers != prevModifiers)
                         {
-                            entityItLookupIt->second.m_initial =
-                                AZ::Transform::CreateTranslation(worldTranslation - localOffset);
+                            entityItLookupIt->second.m_initial = AZ::Transform::CreateTranslation(worldTranslation - localOffset);
                         }
 
                         ETCS::SetEntityWorldTranslation(
-                            entityId, entityItLookupIt->second.m_initial.GetTranslation() + localOffset,
-                            transformChangedInternally);
+                            entityId, entityItLookupIt->second.m_initial.GetTranslation() + localOffset, transformChangedInternally);
                     }
                     break;
                 case ReferenceFrame::Parent:
                 case ReferenceFrame::World:
                     {
-                        AZ::Quaternion offsetRotation =
-                            pivotOrientation.m_worldOrientation *
-                            QuaternionFromTransformNoScaling(
-                                entityIdManipulators.m_manipulators->GetLocalTransform().GetInverse());
+                        AZ::Quaternion offsetRotation = pivotOrientation.m_worldOrientation *
+                            QuaternionFromTransformNoScaling(entityIdManipulators.m_manipulators->GetLocalTransform().GetInverse());
 
                         const AZ::Vector3 localOffset = offsetRotation.TransformVector(action.LocalPositionOffset());
 
                         if (action.m_modifiers != prevModifiers)
                         {
-                            entityItLookupIt->second.m_initial =
-                                AZ::Transform::CreateTranslation(worldTranslation - localOffset);
+                            entityItLookupIt->second.m_initial = AZ::Transform::CreateTranslation(worldTranslation - localOffset);
                         }
 
                         ETCS::SetEntityWorldTranslation(
-                            entityId, entityItLookupIt->second.m_initial.GetTranslation() + localOffset,
-                            transformChangedInternally);
+                            entityId, entityItLookupIt->second.m_initial.GetTranslation() + localOffset, transformChangedInternally);
                     }
                     break;
                 }
@@ -895,8 +878,7 @@ namespace AzToolsFramework
             // if transform pivot override has been set, make sure to update it when we move it
             if (pivotOverrideFrame.m_translationOverride)
             {
-                pivotOverrideFrame.m_translationOverride =
-                    entityIdManipulators.m_manipulators->GetLocalTransform().GetTranslation();
+                pivotOverrideFrame.m_translationOverride = entityIdManipulators.m_manipulators->GetLocalTransform().GetTranslation();
             }
         }
 
@@ -904,8 +886,10 @@ namespace AzToolsFramework
     }
 
     static void HandleAccents(
-        const bool hasSelectedEntities, const AZ::EntityId entityIdUnderCursor,
-        const bool ctrlHeld, AZ::EntityId& hoveredEntityId,
+        const bool hasSelectedEntities,
+        const AZ::EntityId entityIdUnderCursor,
+        const bool ctrlHeld,
+        AZ::EntityId& hoveredEntityId,
         const ViewportInteraction::MouseButtons mouseButtons,
         const bool usingBoxSelect)
     {
@@ -914,13 +898,11 @@ namespace AzToolsFramework
         const bool invalidMouseButtonHeld = mouseButtons.Middle() || mouseButtons.Right();
 
         if ((hoveredEntityId.IsValid() && hoveredEntityId != entityIdUnderCursor) ||
-            (hasSelectedEntities && !ctrlHeld && hoveredEntityId.IsValid()) ||
-            invalidMouseButtonHeld)
+            (hasSelectedEntities && !ctrlHeld && hoveredEntityId.IsValid()) || invalidMouseButtonHeld)
         {
             if (hoveredEntityId.IsValid())
             {
-                ToolsApplicationRequestBus::Broadcast(
-                    &ToolsApplicationRequests::SetEntityHighlighted, hoveredEntityId, false);
+                ToolsApplicationRequestBus::Broadcast(&ToolsApplicationRequests::SetEntityHighlighted, hoveredEntityId, false);
 
                 hoveredEntityId.SetInvalid();
             }
@@ -930,8 +912,7 @@ namespace AzToolsFramework
         {
             if (entityIdUnderCursor.IsValid())
             {
-                ToolsApplicationRequestBus::Broadcast(
-                    &ToolsApplicationRequests::SetEntityHighlighted, entityIdUnderCursor, true);
+                ToolsApplicationRequestBus::Broadcast(&ToolsApplicationRequests::SetEntityHighlighted, entityIdUnderCursor, true);
 
                 hoveredEntityId = entityIdUnderCursor;
             }
@@ -946,15 +927,13 @@ namespace AzToolsFramework
         // get unsnapped terrain position (world space)
         AZ::Vector3 worldSurfacePosition;
         ViewportInteraction::MainEditorViewportInteractionRequestBus::EventResult(
-            worldSurfacePosition, viewportId,
-            &ViewportInteraction::MainEditorViewportInteractionRequestBus::Events::PickTerrain,
+            worldSurfacePosition, viewportId, &ViewportInteraction::MainEditorViewportInteractionRequestBus::Events::PickTerrain,
             mouseInteraction.m_mousePick.m_screenCoordinates);
 
         // convert to local space - snap if enabled
         const GridSnapParameters gridSnapParams = GridSnapSettings(viewportId);
         const AZ::Vector3 finalSurfacePosition = gridSnapParams.m_gridSnap
-            ? CalculateSnappedTerrainPosition(
-                worldSurfacePosition, AZ::Transform::CreateIdentity(), viewportId, gridSnapParams.m_gridSize)
+            ? CalculateSnappedTerrainPosition(worldSurfacePosition, AZ::Transform::CreateIdentity(), viewportId, gridSnapParams.m_gridSize)
             : worldSurfacePosition;
 
         return finalSurfacePosition;
@@ -981,10 +960,9 @@ namespace AzToolsFramework
         for (AZ::EntityId entityId : entityIds)
         {
             AZ::Transform worldFromLocal = AZ::Transform::CreateIdentity();
-            AZ::TransformBus::EventResult(
-                worldFromLocal, entityId, &AZ::TransformBus::Events::GetWorldTM);
+            AZ::TransformBus::EventResult(worldFromLocal, entityId, &AZ::TransformBus::Events::GetWorldTM);
 
-            transformsBefore.insert({ entityId,  worldFromLocal });
+            transformsBefore.insert({ entityId, worldFromLocal });
         }
 
         return transformsBefore;
@@ -992,8 +970,7 @@ namespace AzToolsFramework
 
     // ask the visible entity data cache if the entity is selectable in the viewport
     // (useful in the context of drawing when we only care about entities we can see)
-    static bool SelectableInVisibleViewportCache(
-        const EditorVisibleEntityDataCache& entityDataCache, const AZ::EntityId entityId)
+    static bool SelectableInVisibleViewportCache(const EditorVisibleEntityDataCache& entityDataCache, const AZ::EntityId entityId)
     {
         if (auto entityIndex = entityDataCache.GetVisibleEntityIndexFromId(entityId))
         {
@@ -1021,15 +998,12 @@ namespace AzToolsFramework
     // is handled internally - this call is often required after an action/shortcut of some kind
     static void RefreshUiAfterChange(const EntityIdList& entitiyIds)
     {
-        EditorTransformChangeNotificationBus::Broadcast(
-            &EditorTransformChangeNotifications::OnEntityTransformChanged, entitiyIds);
+        EditorTransformChangeNotificationBus::Broadcast(&EditorTransformChangeNotifications::OnEntityTransformChanged, entitiyIds);
 
-        ToolsApplicationNotificationBus::Broadcast(
-            &ToolsApplicationNotificationBus::Events::InvalidatePropertyDisplay, Refresh_Values);
+        ToolsApplicationNotificationBus::Broadcast(&ToolsApplicationNotificationBus::Events::InvalidatePropertyDisplay, Refresh_Values);
     }
 
-    EditorTransformComponentSelection::EditorTransformComponentSelection(
-        const EditorVisibleEntityDataCache* entityDataCache)
+    EditorTransformComponentSelection::EditorTransformComponentSelection(const EditorVisibleEntityDataCache* entityDataCache)
         : m_entityDataCache(entityDataCache)
     {
         const AzFramework::EntityContextId entityContextId = GetEntityContextId();
@@ -1090,101 +1064,96 @@ namespace AzToolsFramework
 
         m_boxSelect.InstallLeftMouseDown(
             [this, entityBoxSelectData](const ViewportInteraction::MouseInteractionEvent& /*mouseInteraction*/)
-        {
-            // begin selection undo/redo command
-            entityBoxSelectData->m_boxSelectSelectionCommand =
-                AZStd::make_unique<SelectionCommand>(EntityIdList(), s_entityBoxSelectUndoRedoDesc);
-            // grab currently selected entities
-            entityBoxSelectData->m_selectedEntityIdsBeforeBoxSelect = m_selectedEntityIds;
-        });
+            {
+                // begin selection undo/redo command
+                entityBoxSelectData->m_boxSelectSelectionCommand =
+                    AZStd::make_unique<SelectionCommand>(EntityIdList(), s_entityBoxSelectUndoRedoDesc);
+                // grab currently selected entities
+                entityBoxSelectData->m_selectedEntityIdsBeforeBoxSelect = m_selectedEntityIds;
+            });
 
         m_boxSelect.InstallMouseMove(
             [this, entityBoxSelectData](const ViewportInteraction::MouseInteractionEvent& mouseInteraction)
-        {
-            EntityBoxSelectUpdateGeneral(
-                m_boxSelect.BoxRegion(), *this, m_selectedEntityIds, entityBoxSelectData->m_selectedEntityIdsBeforeBoxSelect,
-                entityBoxSelectData->m_potentialSelectedEntityIds, entityBoxSelectData->m_potentialDeselectedEntityIds,
-                *m_entityDataCache, mouseInteraction.m_mouseInteraction.m_interactionId.m_viewportId,
-                mouseInteraction.m_mouseInteraction.m_keyboardModifiers,
-                m_boxSelect.PreviousModifiers());
-        });
+            {
+                EntityBoxSelectUpdateGeneral(
+                    m_boxSelect.BoxRegion(), *this, m_selectedEntityIds, entityBoxSelectData->m_selectedEntityIdsBeforeBoxSelect,
+                    entityBoxSelectData->m_potentialSelectedEntityIds, entityBoxSelectData->m_potentialDeselectedEntityIds,
+                    *m_entityDataCache, mouseInteraction.m_mouseInteraction.m_interactionId.m_viewportId,
+                    mouseInteraction.m_mouseInteraction.m_keyboardModifiers, m_boxSelect.PreviousModifiers());
+            });
 
         m_boxSelect.InstallLeftMouseUp(
             [this, entityBoxSelectData]()
-        {
-            entityBoxSelectData->m_boxSelectSelectionCommand->UpdateSelection(EntityIdVectorFromContainer(m_selectedEntityIds));
-
-            // if we know a change in selection has occurred, record the undo step
-            if (    !entityBoxSelectData->m_potentialDeselectedEntityIds.empty()
-                ||  !entityBoxSelectData->m_potentialSelectedEntityIds.empty())
             {
-                ScopedUndoBatch undoBatch(s_entityBoxSelectUndoRedoDesc);
+                entityBoxSelectData->m_boxSelectSelectionCommand->UpdateSelection(EntityIdVectorFromContainer(m_selectedEntityIds));
 
-                // restore manipulator overrides when undoing
-                if (m_entityIdManipulators.m_manipulators && m_selectedEntityIds.empty())
+                // if we know a change in selection has occurred, record the undo step
+                if (!entityBoxSelectData->m_potentialDeselectedEntityIds.empty() ||
+                    !entityBoxSelectData->m_potentialSelectedEntityIds.empty())
                 {
-                    CreateEntityManipulatorDeselectCommand(undoBatch);
+                    ScopedUndoBatch undoBatch(s_entityBoxSelectUndoRedoDesc);
+
+                    // restore manipulator overrides when undoing
+                    if (m_entityIdManipulators.m_manipulators && m_selectedEntityIds.empty())
+                    {
+                        CreateEntityManipulatorDeselectCommand(undoBatch);
+                    }
+
+                    entityBoxSelectData->m_boxSelectSelectionCommand->SetParent(undoBatch.GetUndoBatch());
+                    entityBoxSelectData->m_boxSelectSelectionCommand.release();
+
+                    SetSelectedEntities(EntityIdVectorFromContainer(m_selectedEntityIds));
+                    // note: manipulators will be updated in AfterEntitySelectionChanged
+
+                    // clear pivot override when selection is empty
+                    if (m_selectedEntityIds.empty())
+                    {
+                        m_pivotOverrideFrame.Reset();
+                    }
+                }
+                else
+                {
+                    entityBoxSelectData->m_boxSelectSelectionCommand.reset();
                 }
 
-                entityBoxSelectData->m_boxSelectSelectionCommand->SetParent(undoBatch.GetUndoBatch());
-                entityBoxSelectData->m_boxSelectSelectionCommand.release();
-
-                SetSelectedEntities(EntityIdVectorFromContainer(m_selectedEntityIds));
-                // note: manipulators will be updated in AfterEntitySelectionChanged
-
-                // clear pivot override when selection is empty
-                if (m_selectedEntityIds.empty())
-                {
-                    m_pivotOverrideFrame.Reset();
-                }
-            }
-            else
-            {
-                entityBoxSelectData->m_boxSelectSelectionCommand.reset();
-            }
-
-            entityBoxSelectData->m_potentialSelectedEntityIds.clear();
-            entityBoxSelectData->m_potentialDeselectedEntityIds.clear();
-            entityBoxSelectData->m_selectedEntityIdsBeforeBoxSelect.clear();
-        });
+                entityBoxSelectData->m_potentialSelectedEntityIds.clear();
+                entityBoxSelectData->m_potentialDeselectedEntityIds.clear();
+                entityBoxSelectData->m_selectedEntityIdsBeforeBoxSelect.clear();
+            });
 
         m_boxSelect.InstallDisplayScene(
-            [this, entityBoxSelectData]
-            (const AzFramework::ViewportInfo& viewportInfo, AzFramework::DebugDisplayRequests& debugDisplay)
-        {
-            const auto modifiers = ViewportInteraction::KeyboardModifiers(
-                ViewportInteraction::TranslateKeyboardModifiers(QApplication::queryKeyboardModifiers()));
-
-            if (m_boxSelect.PreviousModifiers() != modifiers)
+            [this, entityBoxSelectData](const AzFramework::ViewportInfo& viewportInfo, AzFramework::DebugDisplayRequests& debugDisplay)
             {
-                EntityBoxSelectUpdateGeneral(
-                    m_boxSelect.BoxRegion(), *this, m_selectedEntityIds,
-                    entityBoxSelectData->m_selectedEntityIdsBeforeBoxSelect,
-                    entityBoxSelectData->m_potentialSelectedEntityIds,
-                    entityBoxSelectData->m_potentialDeselectedEntityIds,
-                    *m_entityDataCache, viewportInfo.m_viewportId, modifiers,
-                    m_boxSelect.PreviousModifiers());
-            }
+                const auto modifiers = ViewportInteraction::KeyboardModifiers(
+                    ViewportInteraction::TranslateKeyboardModifiers(QApplication::queryKeyboardModifiers()));
 
-            debugDisplay.DepthTestOff();
-            debugDisplay.SetColor(s_selectedEntityAabbColor);
-
-            for (AZ::EntityId entityId : entityBoxSelectData->m_potentialSelectedEntityIds)
-            {
-                const auto entityIdIt = entityBoxSelectData->m_selectedEntityIdsBeforeBoxSelect.find(entityId);
-
-                // don't show box when re-adding from previous selection
-                if (entityIdIt != entityBoxSelectData->m_selectedEntityIdsBeforeBoxSelect.end())
+                if (m_boxSelect.PreviousModifiers() != modifiers)
                 {
-                    continue;
+                    EntityBoxSelectUpdateGeneral(
+                        m_boxSelect.BoxRegion(), *this, m_selectedEntityIds, entityBoxSelectData->m_selectedEntityIdsBeforeBoxSelect,
+                        entityBoxSelectData->m_potentialSelectedEntityIds, entityBoxSelectData->m_potentialDeselectedEntityIds,
+                        *m_entityDataCache, viewportInfo.m_viewportId, modifiers, m_boxSelect.PreviousModifiers());
                 }
 
-                const AZ::Aabb bound = CalculateEditorEntitySelectionBounds(entityId, viewportInfo);
-                debugDisplay.DrawSolidBox(bound.GetMin(), bound.GetMax());
-            }
+                debugDisplay.DepthTestOff();
+                debugDisplay.SetColor(s_selectedEntityAabbColor);
 
-            debugDisplay.DepthTestOn();
-        });
+                for (AZ::EntityId entityId : entityBoxSelectData->m_potentialSelectedEntityIds)
+                {
+                    const auto entityIdIt = entityBoxSelectData->m_selectedEntityIdsBeforeBoxSelect.find(entityId);
+
+                    // don't show box when re-adding from previous selection
+                    if (entityIdIt != entityBoxSelectData->m_selectedEntityIdsBeforeBoxSelect.end())
+                    {
+                        continue;
+                    }
+
+                    const AZ::Aabb bound = CalculateEditorEntitySelectionBounds(entityId, viewportInfo);
+                    debugDisplay.DrawSolidBox(bound.GetMin(), bound.GetMax());
+                }
+
+                debugDisplay.DepthTestOn();
+            });
     }
 
     EntityManipulatorCommand::State EditorTransformComponentSelection::CreateManipulatorCommandStateFromSelf() const
@@ -1197,14 +1166,9 @@ namespace AzToolsFramework
             return {};
         }
 
-        return {
-            BuildPivotOverride(
-                m_pivotOverrideFrame.HasTranslationOverride(),
-                m_pivotOverrideFrame.HasOrientationOverride()),
-            TransformNormalizedScale(
-                m_entityIdManipulators.m_manipulators->GetLocalTransform()),
-                m_pivotOverrideFrame.m_pickedEntityIdOverride
-        };
+        return { BuildPivotOverride(m_pivotOverrideFrame.HasTranslationOverride(), m_pivotOverrideFrame.HasOrientationOverride()),
+                 TransformNormalizedScale(m_entityIdManipulators.m_manipulators->GetLocalTransform()),
+                 m_pivotOverrideFrame.m_pickedEntityIdOverride };
     }
 
     void EditorTransformComponentSelection::BeginRecordManipulatorCommand()
@@ -1214,14 +1178,13 @@ namespace AzToolsFramework
         // we must have an existing parent undo batch active when beginning to record
         // a manipulator command
         UndoSystem::URSequencePoint* currentUndoOperation = nullptr;
-        ToolsApplicationRequests::Bus::BroadcastResult(
-            currentUndoOperation, &ToolsApplicationRequests::GetCurrentUndoBatch);
+        ToolsApplicationRequests::Bus::BroadcastResult(currentUndoOperation, &ToolsApplicationRequests::GetCurrentUndoBatch);
 
         if (currentUndoOperation)
         {
             // check here if translation or orientation override are set
-            m_manipulatorMoveCommand = AZStd::make_unique<EntityManipulatorCommand>(
-                CreateManipulatorCommandStateFromSelf(), s_manipulatorUndoRedoName);
+            m_manipulatorMoveCommand =
+                AZStd::make_unique<EntityManipulatorCommand>(CreateManipulatorCommandStateFromSelf(), s_manipulatorUndoRedoName);
         }
     }
 
@@ -1234,10 +1197,11 @@ namespace AzToolsFramework
             m_manipulatorMoveCommand->SetManipulatorAfter(CreateManipulatorCommandStateFromSelf());
 
             UndoSystem::URSequencePoint* currentUndoOperation = nullptr;
-            ToolsApplicationRequests::Bus::BroadcastResult(
-                currentUndoOperation, &ToolsApplicationRequests::GetCurrentUndoBatch);
+            ToolsApplicationRequests::Bus::BroadcastResult(currentUndoOperation, &ToolsApplicationRequests::GetCurrentUndoBatch);
 
-            AZ_Assert(currentUndoOperation, "The only way we should have reached this block is if "
+            AZ_Assert(
+                currentUndoOperation,
+                "The only way we should have reached this block is if "
                 "m_manipulatorMoveCommand was created by calling BeginRecordManipulatorMouseMoveCommand. "
                 "If we've reached this point and currentUndoOperation is null, something bad has happened "
                 "in the undo system");
@@ -1254,18 +1218,15 @@ namespace AzToolsFramework
     {
         AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
 
-        AZStd::unique_ptr<TranslationManipulators> translationManipulators =
-            AZStd::make_unique<TranslationManipulators>(
-                TranslationManipulators::Dimensions::Three,
-                AZ::Transform::CreateIdentity(), AZ::Vector3::CreateOne());
+        AZStd::unique_ptr<TranslationManipulators> translationManipulators = AZStd::make_unique<TranslationManipulators>(
+            TranslationManipulators::Dimensions::Three, AZ::Transform::CreateIdentity(), AZ::Vector3::CreateOne());
 
         InitializeManipulators(*translationManipulators);
 
         ConfigureTranslationManipulatorAppearance3d(&*translationManipulators);
 
         translationManipulators->SetLocalTransform(
-            RecalculateAverageManipulatorTransform(
-                m_entityIdManipulators.m_lookups, m_pivotOverrideFrame, m_pivotMode, m_referenceFrame));
+            RecalculateAverageManipulatorTransform(m_entityIdManipulators.m_lookups, m_pivotOverrideFrame, m_pivotMode, m_referenceFrame));
 
         // lambdas capture shared_ptr by value to increment ref count
         auto manipulatorEntityIds = AZStd::make_shared<ManipulatorEntityIds>();
@@ -1277,95 +1238,92 @@ namespace AzToolsFramework
         // linear
         translationManipulators->InstallLinearManipulatorMouseDownCallback(
             [this, manipulatorEntityIds]([[maybe_unused]] const LinearManipulator::Action& action) mutable
-        {
-            // important to sort entityIds based on hierarchy order when updating transforms
-            BuildSortedEntityIdVectorFromEntityIdMap(m_entityIdManipulators.m_lookups, manipulatorEntityIds->m_entityIds);
+            {
+                // important to sort entityIds based on hierarchy order when updating transforms
+                BuildSortedEntityIdVectorFromEntityIdMap(m_entityIdManipulators.m_lookups, manipulatorEntityIds->m_entityIds);
 
-            InitializeTranslationLookup(m_entityIdManipulators);
+                InitializeTranslationLookup(m_entityIdManipulators);
 
-            m_axisPreview.m_translation = m_entityIdManipulators.m_manipulators->GetLocalTransform().GetTranslation();
-            m_axisPreview.m_orientation = QuaternionFromTransformNoScaling(
-                m_entityIdManipulators.m_manipulators->GetLocalTransform());
+                m_axisPreview.m_translation = m_entityIdManipulators.m_manipulators->GetLocalTransform().GetTranslation();
+                m_axisPreview.m_orientation = QuaternionFromTransformNoScaling(m_entityIdManipulators.m_manipulators->GetLocalTransform());
 
-            // [ref 1.]
-            BeginRecordManipulatorCommand();
-        });
+                // [ref 1.]
+                BeginRecordManipulatorCommand();
+            });
 
         ViewportInteraction::KeyboardModifiers prevModifiers{};
         translationManipulators->InstallLinearManipulatorMouseMoveCallback(
             [this, prevModifiers, manipulatorEntityIds](const LinearManipulator::Action& action) mutable -> void
-        {
-            UpdateTranslationManipulator(
-                action, manipulatorEntityIds->m_entityIds, m_entityIdManipulators, m_pivotOverrideFrame, prevModifiers,
+            {
+                UpdateTranslationManipulator(
+                    action, manipulatorEntityIds->m_entityIds, m_entityIdManipulators, m_pivotOverrideFrame, prevModifiers,
                     m_transformChangedInternally, m_spaceCluster.m_spaceLock);
-        });
+            });
 
         translationManipulators->InstallLinearManipulatorMouseUpCallback(
             [this]([[maybe_unused]] const LinearManipulator::Action& action) mutable
-        {
-            EndRecordManipulatorCommand();
-        });
+            {
+                EndRecordManipulatorCommand();
+            });
 
         // planar
         translationManipulators->InstallPlanarManipulatorMouseDownCallback(
             [this, manipulatorEntityIds]([[maybe_unused]] const PlanarManipulator::Action& action)
-        {
-            // important to sort entityIds based on hierarchy order when updating transforms
-            BuildSortedEntityIdVectorFromEntityIdMap(m_entityIdManipulators.m_lookups, manipulatorEntityIds->m_entityIds);
+            {
+                // important to sort entityIds based on hierarchy order when updating transforms
+                BuildSortedEntityIdVectorFromEntityIdMap(m_entityIdManipulators.m_lookups, manipulatorEntityIds->m_entityIds);
 
-            InitializeTranslationLookup(m_entityIdManipulators);
+                InitializeTranslationLookup(m_entityIdManipulators);
 
-            m_axisPreview.m_translation = m_entityIdManipulators.m_manipulators->GetLocalTransform().GetTranslation();
-            m_axisPreview.m_orientation = QuaternionFromTransformNoScaling(
-                m_entityIdManipulators.m_manipulators->GetLocalTransform());
+                m_axisPreview.m_translation = m_entityIdManipulators.m_manipulators->GetLocalTransform().GetTranslation();
+                m_axisPreview.m_orientation = QuaternionFromTransformNoScaling(m_entityIdManipulators.m_manipulators->GetLocalTransform());
 
-            // [ref 1.]
-            BeginRecordManipulatorCommand();
-        });
+                // [ref 1.]
+                BeginRecordManipulatorCommand();
+            });
 
         translationManipulators->InstallPlanarManipulatorMouseMoveCallback(
             [this, prevModifiers, manipulatorEntityIds](const PlanarManipulator::Action& action) mutable -> void
-        {
-            UpdateTranslationManipulator(
-                action, manipulatorEntityIds->m_entityIds, m_entityIdManipulators, m_pivotOverrideFrame, prevModifiers,
+            {
+                UpdateTranslationManipulator(
+                    action, manipulatorEntityIds->m_entityIds, m_entityIdManipulators, m_pivotOverrideFrame, prevModifiers,
                     m_transformChangedInternally, m_spaceCluster.m_spaceLock);
-        });
+            });
 
         translationManipulators->InstallPlanarManipulatorMouseUpCallback(
             [this, manipulatorEntityIds](const PlanarManipulator::Action& /*action*/)
-        {
-            EndRecordManipulatorCommand();
-        });
+            {
+                EndRecordManipulatorCommand();
+            });
 
         // surface
         translationManipulators->InstallSurfaceManipulatorMouseDownCallback(
             [this, manipulatorEntityIds]([[maybe_unused]] const SurfaceManipulator::Action& action)
-        {
-            BuildSortedEntityIdVectorFromEntityIdMap(m_entityIdManipulators.m_lookups, manipulatorEntityIds->m_entityIds);
+            {
+                BuildSortedEntityIdVectorFromEntityIdMap(m_entityIdManipulators.m_lookups, manipulatorEntityIds->m_entityIds);
 
-            InitializeTranslationLookup(m_entityIdManipulators);
+                InitializeTranslationLookup(m_entityIdManipulators);
 
-            m_axisPreview.m_translation = m_entityIdManipulators.m_manipulators->GetLocalTransform().GetTranslation();
-            m_axisPreview.m_orientation = QuaternionFromTransformNoScaling(
-                m_entityIdManipulators.m_manipulators->GetLocalTransform());
+                m_axisPreview.m_translation = m_entityIdManipulators.m_manipulators->GetLocalTransform().GetTranslation();
+                m_axisPreview.m_orientation = QuaternionFromTransformNoScaling(m_entityIdManipulators.m_manipulators->GetLocalTransform());
 
-            // [ref 1.]
-            BeginRecordManipulatorCommand();
-        });
+                // [ref 1.]
+                BeginRecordManipulatorCommand();
+            });
 
         translationManipulators->InstallSurfaceManipulatorMouseMoveCallback(
             [this, prevModifiers, manipulatorEntityIds](const SurfaceManipulator::Action& action) mutable -> void
-        {
-            UpdateTranslationManipulator(
-                action, manipulatorEntityIds->m_entityIds, m_entityIdManipulators, m_pivotOverrideFrame, prevModifiers,
+            {
+                UpdateTranslationManipulator(
+                    action, manipulatorEntityIds->m_entityIds, m_entityIdManipulators, m_pivotOverrideFrame, prevModifiers,
                     m_transformChangedInternally, m_spaceCluster.m_spaceLock);
-        });
+            });
 
         translationManipulators->InstallSurfaceManipulatorMouseUpCallback(
             [this, manipulatorEntityIds](const SurfaceManipulator::Action& /*action*/)
-        {
-            EndRecordManipulatorCommand();
-        });
+            {
+                EndRecordManipulatorCommand();
+            });
 
         // transfer ownership
         m_entityIdManipulators.m_manipulators = AZStd::move(translationManipulators);
@@ -1381,18 +1339,12 @@ namespace AzToolsFramework
         InitializeManipulators(*rotationManipulators);
 
         rotationManipulators->SetLocalTransform(
-            RecalculateAverageManipulatorTransform(
-                m_entityIdManipulators.m_lookups, m_pivotOverrideFrame, m_pivotMode, m_referenceFrame));
+            RecalculateAverageManipulatorTransform(m_entityIdManipulators.m_lookups, m_pivotOverrideFrame, m_pivotMode, m_referenceFrame));
 
         // view
-        rotationManipulators->SetLocalAxes(
-            AZ::Vector3::CreateAxisX(),
-            AZ::Vector3::CreateAxisY(),
-            AZ::Vector3::CreateAxisZ());
+        rotationManipulators->SetLocalAxes(AZ::Vector3::CreateAxisX(), AZ::Vector3::CreateAxisY(), AZ::Vector3::CreateAxisZ());
         rotationManipulators->ConfigureView(
-            2.0f,
-            AzFramework::ViewportColors::XAxisColor,
-            AzFramework::ViewportColors::YAxisColor,
+            2.0f, AzFramework::ViewportColors::XAxisColor, AzFramework::ViewportColors::YAxisColor,
             AzFramework::ViewportColors::ZAxisColor);
 
         struct SharedRotationState
@@ -1403,149 +1355,139 @@ namespace AzToolsFramework
         };
 
         // lambdas capture shared_ptr by value to increment ref count
-        AZStd::shared_ptr<SharedRotationState> sharedRotationState =
-            AZStd::make_shared<SharedRotationState>();
+        AZStd::shared_ptr<SharedRotationState> sharedRotationState = AZStd::make_shared<SharedRotationState>();
 
         rotationManipulators->InstallLeftMouseDownCallback(
             [this, sharedRotationState](const AngularManipulator::Action& /*action*/) mutable -> void
-        {
-            sharedRotationState->m_savedOrientation = AZ::Quaternion::CreateIdentity();
-            sharedRotationState->m_referenceFrameAtMouseDown = m_referenceFrame;
-            // important to sort entityIds based on hierarchy order when updating transforms
-            BuildSortedEntityIdVectorFromEntityIdMap(m_entityIdManipulators.m_lookups, sharedRotationState->m_entityIds);
-
-            for (auto& entityIdLookup : m_entityIdManipulators.m_lookups)
             {
-                AZ::Transform worldFromLocal = AZ::Transform::CreateIdentity();
-                AZ::TransformBus::EventResult(
-                    worldFromLocal, entityIdLookup.first, &AZ::TransformBus::Events::GetWorldTM);
+                sharedRotationState->m_savedOrientation = AZ::Quaternion::CreateIdentity();
+                sharedRotationState->m_referenceFrameAtMouseDown = m_referenceFrame;
+                // important to sort entityIds based on hierarchy order when updating transforms
+                BuildSortedEntityIdVectorFromEntityIdMap(m_entityIdManipulators.m_lookups, sharedRotationState->m_entityIds);
 
-                entityIdLookup.second.m_initial = worldFromLocal;
-            }
+                for (auto& entityIdLookup : m_entityIdManipulators.m_lookups)
+                {
+                    AZ::Transform worldFromLocal = AZ::Transform::CreateIdentity();
+                    AZ::TransformBus::EventResult(worldFromLocal, entityIdLookup.first, &AZ::TransformBus::Events::GetWorldTM);
 
-            m_axisPreview.m_translation = m_entityIdManipulators.m_manipulators->GetLocalTransform().GetTranslation();
-            m_axisPreview.m_orientation = QuaternionFromTransformNoScaling(
-                m_entityIdManipulators.m_manipulators->GetLocalTransform());
+                    entityIdLookup.second.m_initial = worldFromLocal;
+                }
 
-            // [ref 1.]
-            BeginRecordManipulatorCommand();
-        });
+                m_axisPreview.m_translation = m_entityIdManipulators.m_manipulators->GetLocalTransform().GetTranslation();
+                m_axisPreview.m_orientation = QuaternionFromTransformNoScaling(m_entityIdManipulators.m_manipulators->GetLocalTransform());
+
+                // [ref 1.]
+                BeginRecordManipulatorCommand();
+            });
 
         ViewportInteraction::KeyboardModifiers prevModifiers{};
         rotationManipulators->InstallMouseMoveCallback(
-            [this, prevModifiers, sharedRotationState]
-            (const AngularManipulator::Action& action) mutable -> void
-        {
-            const ReferenceFrame referenceFrame = m_spaceCluster.m_spaceLock.value_or(ReferenceFrameFromModifiers(action.m_modifiers));
-            const AZ::Quaternion manipulatorOrientation = action.m_start.m_rotation * action.m_current.m_delta;
-            // store the pivot override frame when positioning the manipulator manually (ctrl)
-            // so we don't lose the orientation when adding/removing entities from the selection
-            if (action.m_modifiers.Ctrl())
+            [this, prevModifiers, sharedRotationState](const AngularManipulator::Action& action) mutable -> void
             {
-                m_pivotOverrideFrame.m_orientationOverride = manipulatorOrientation;
-            }
+                const ReferenceFrame referenceFrame = m_spaceCluster.m_spaceLock.value_or(ReferenceFrameFromModifiers(action.m_modifiers));
+                const AZ::Quaternion manipulatorOrientation = action.m_start.m_rotation * action.m_current.m_delta;
+                // store the pivot override frame when positioning the manipulator manually (ctrl)
+                // so we don't lose the orientation when adding/removing entities from the selection
+                if (action.m_modifiers.Ctrl())
+                {
+                    m_pivotOverrideFrame.m_orientationOverride = manipulatorOrientation;
+                }
 
-            // only update the manipulator orientation if we're rotating in a local reference frame or we're
-            // manually modifying the manipulator orientation independent of the entity by holding ctrl
-            if ((sharedRotationState->m_referenceFrameAtMouseDown == ReferenceFrame::Local
-                && m_entityIdManipulators.m_lookups.size() == 1) || action.m_modifiers.Ctrl())
-            {
-                m_entityIdManipulators.m_manipulators->SetLocalTransform(
-                    AZ::Transform::CreateFromQuaternionAndTranslation(
-                        manipulatorOrientation,
-                        m_entityIdManipulators.m_manipulators->GetLocalTransform().GetTranslation()));
-            }
+                // only update the manipulator orientation if we're rotating in a local reference frame or we're
+                // manually modifying the manipulator orientation independent of the entity by holding ctrl
+                if ((sharedRotationState->m_referenceFrameAtMouseDown == ReferenceFrame::Local &&
+                     m_entityIdManipulators.m_lookups.size() == 1) ||
+                    action.m_modifiers.Ctrl())
+                {
+                    m_entityIdManipulators.m_manipulators->SetLocalTransform(AZ::Transform::CreateFromQuaternionAndTranslation(
+                        manipulatorOrientation, m_entityIdManipulators.m_manipulators->GetLocalTransform().GetTranslation()));
+                }
 
-            // save state if we change the type of rotation we're doing to to prevent snapping
-            if (prevModifiers != action.m_modifiers)
-            {
-                UpdateInitialRotation(m_entityIdManipulators);
-                sharedRotationState->m_savedOrientation = action.m_current.m_delta.GetInverseFull();
-            }
+                // save state if we change the type of rotation we're doing to to prevent snapping
+                if (prevModifiers != action.m_modifiers)
+                {
+                    UpdateInitialRotation(m_entityIdManipulators);
+                    sharedRotationState->m_savedOrientation = action.m_current.m_delta.GetInverseFull();
+                }
 
-            // allow the user to modify the orientation without moving the object if ctrl is held
-            if (action.m_modifiers.Ctrl())
-            {
-                UpdateInitialRotation(m_entityIdManipulators);
-                sharedRotationState->m_savedOrientation = action.m_current.m_delta.GetInverseFull();
-            }
-            else
-            {
-                const auto pivotOrientation =
-                    ETCS::CalculateSelectionPivotOrientation(
+                // allow the user to modify the orientation without moving the object if ctrl is held
+                if (action.m_modifiers.Ctrl())
+                {
+                    UpdateInitialRotation(m_entityIdManipulators);
+                    sharedRotationState->m_savedOrientation = action.m_current.m_delta.GetInverseFull();
+                }
+                else
+                {
+                    const auto pivotOrientation = ETCS::CalculateSelectionPivotOrientation(
                         m_entityIdManipulators.m_lookups, m_pivotOverrideFrame, ReferenceFrame::Parent);
 
-                // note: must use sorted entityIds based on hierarchy order when updating transforms
-                for (AZ::EntityId entityId : sharedRotationState->m_entityIds)
-                {
-                    auto entityIdLookupIt = m_entityIdManipulators.m_lookups.find(entityId);
-                    if (entityIdLookupIt == m_entityIdManipulators.m_lookups.end())
+                    // note: must use sorted entityIds based on hierarchy order when updating transforms
+                    for (AZ::EntityId entityId : sharedRotationState->m_entityIds)
                     {
-                        continue;
-                    }
-
-                    // make sure we take into account how we move the axis independent of object
-                    // if Ctrl was held to adjust the orientation of the axes separately
-                    const AZ::Transform offsetRotation = AZ::Transform::CreateFromQuaternion(
-                        sharedRotationState->m_savedOrientation * action.m_current.m_delta);
-
-                    switch (referenceFrame)
-                    {
-                    case ReferenceFrame::Local:
+                        auto entityIdLookupIt = m_entityIdManipulators.m_lookups.find(entityId);
+                        if (entityIdLookupIt == m_entityIdManipulators.m_lookups.end())
                         {
-                            const AZ::Quaternion rotation = entityIdLookupIt->second.m_initial.GetRotation().GetNormalized();
-                            const AZ::Vector3 position = entityIdLookupIt->second.m_initial.GetTranslation();
-                            const float scale = entityIdLookupIt->second.m_initial.GetUniformScale();
-
-                            const AZ::Vector3 centerOffset = CalculateCenterOffset(entityId, m_pivotMode);
-
-                            // scale -> rotate -> translate
-                            SetEntityWorldTransform(
-                                entityId,
-                                AZ::Transform::CreateTranslation(position) *
-                                    AZ::Transform::CreateFromQuaternion(rotation) *
-                                    AZ::Transform::CreateTranslation(centerOffset) * offsetRotation *
-                                    AZ::Transform::CreateTranslation(-centerOffset) *
-                                    AZ::Transform::CreateUniformScale(scale));
+                            continue;
                         }
-                        break;
-                    case ReferenceFrame::Parent:
+
+                        // make sure we take into account how we move the axis independent of object
+                        // if Ctrl was held to adjust the orientation of the axes separately
+                        const AZ::Transform offsetRotation =
+                            AZ::Transform::CreateFromQuaternion(sharedRotationState->m_savedOrientation * action.m_current.m_delta);
+
+                        switch (referenceFrame)
                         {
-                            const AZ::Transform pivotTransform =
-                                AZ::Transform::CreateFromQuaternionAndTranslation(
+                        case ReferenceFrame::Local:
+                            {
+                                const AZ::Quaternion rotation = entityIdLookupIt->second.m_initial.GetRotation().GetNormalized();
+                                const AZ::Vector3 position = entityIdLookupIt->second.m_initial.GetTranslation();
+                                const float scale = entityIdLookupIt->second.m_initial.GetUniformScale();
+
+                                const AZ::Vector3 centerOffset = CalculateCenterOffset(entityId, m_pivotMode);
+
+                                // scale -> rotate -> translate
+                                SetEntityWorldTransform(
+                                    entityId,
+                                    AZ::Transform::CreateTranslation(position) * AZ::Transform::CreateFromQuaternion(rotation) *
+                                        AZ::Transform::CreateTranslation(centerOffset) * offsetRotation *
+                                        AZ::Transform::CreateTranslation(-centerOffset) * AZ::Transform::CreateUniformScale(scale));
+                            }
+                            break;
+                        case ReferenceFrame::Parent:
+                            {
+                                const AZ::Transform pivotTransform = AZ::Transform::CreateFromQuaternionAndTranslation(
                                     pivotOrientation.m_worldOrientation,
                                     m_entityIdManipulators.m_manipulators->GetLocalTransform().GetTranslation());
 
-                            const AZ::Transform transformInPivotSpace =
-                                pivotTransform.GetInverse() * entityIdLookupIt->second.m_initial;
+                                const AZ::Transform transformInPivotSpace =
+                                    pivotTransform.GetInverse() * entityIdLookupIt->second.m_initial;
 
-                            SetEntityWorldTransform(entityId, pivotTransform * offsetRotation * transformInPivotSpace);
-                        }
-                        break;
-                    case ReferenceFrame::World:
-                        {
-                            const AZ::Transform pivotTransform =
-                                AZ::Transform::CreateFromQuaternionAndTranslation(
+                                SetEntityWorldTransform(entityId, pivotTransform * offsetRotation * transformInPivotSpace);
+                            }
+                            break;
+                        case ReferenceFrame::World:
+                            {
+                                const AZ::Transform pivotTransform = AZ::Transform::CreateFromQuaternionAndTranslation(
                                     AZ::Quaternion::CreateIdentity(),
                                     m_entityIdManipulators.m_manipulators->GetLocalTransform().GetTranslation());
-                            const AZ::Transform transformInPivotSpace =
-                                pivotTransform.GetInverse() * entityIdLookupIt->second.m_initial;
+                                const AZ::Transform transformInPivotSpace =
+                                    pivotTransform.GetInverse() * entityIdLookupIt->second.m_initial;
 
-                            SetEntityWorldTransform(entityId, pivotTransform * offsetRotation * transformInPivotSpace);
+                                SetEntityWorldTransform(entityId, pivotTransform * offsetRotation * transformInPivotSpace);
+                            }
+                            break;
                         }
-                        break;
                     }
                 }
-            }
 
-            prevModifiers = action.m_modifiers;
-        });
+                prevModifiers = action.m_modifiers;
+            });
 
         rotationManipulators->InstallLeftMouseUpCallback(
             [this](const AngularManipulator::Action& /*action*/)
-        {
-            EndRecordManipulatorCommand();
-        });
+            {
+                EndRecordManipulatorCommand();
+            });
 
         rotationManipulators->Register(g_mainManipulatorManagerId);
 
@@ -1557,30 +1499,20 @@ namespace AzToolsFramework
     {
         AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
 
-        AZStd::unique_ptr<ScaleManipulators> scaleManipulators =
-            AZStd::make_unique<ScaleManipulators>(AZ::Transform::CreateIdentity());
+        AZStd::unique_ptr<ScaleManipulators> scaleManipulators = AZStd::make_unique<ScaleManipulators>(AZ::Transform::CreateIdentity());
 
         InitializeManipulators(*scaleManipulators);
 
         scaleManipulators->SetLocalTransform(
-            RecalculateAverageManipulatorTransform(
-                m_entityIdManipulators.m_lookups, m_pivotOverrideFrame, m_pivotMode, m_referenceFrame));
+            RecalculateAverageManipulatorTransform(m_entityIdManipulators.m_lookups, m_pivotOverrideFrame, m_pivotMode, m_referenceFrame));
 
-        scaleManipulators->SetAxes(
-            AZ::Vector3::CreateAxisX(),
-            AZ::Vector3::CreateAxisY(),
-            AZ::Vector3::CreateAxisZ());
-        scaleManipulators->ConfigureView(
-            2.0f,
-            AZ::Color::CreateOne(),
-            AZ::Color::CreateOne(),
-            AZ::Color::CreateOne());
+        scaleManipulators->SetAxes(AZ::Vector3::CreateAxisX(), AZ::Vector3::CreateAxisY(), AZ::Vector3::CreateAxisZ());
+        scaleManipulators->ConfigureView(2.0f, AZ::Color::CreateOne(), AZ::Color::CreateOne(), AZ::Color::CreateOne());
 
         // lambdas capture shared_ptr by value to increment ref count
         auto manipulatorEntityIds = AZStd::make_shared<ManipulatorEntityIds>();
 
-        auto uniformLeftMouseDownCallback =
-            [this, manipulatorEntityIds]([[maybe_unused]] const LinearManipulator::Action& action)
+        auto uniformLeftMouseDownCallback = [this, manipulatorEntityIds]([[maybe_unused]] const LinearManipulator::Action& action)
         {
             // important to sort entityIds based on hierarchy order when updating transforms
             BuildSortedEntityIdVectorFromEntityIdMap(m_entityIdManipulators.m_lookups, manipulatorEntityIds->m_entityIds);
@@ -1588,22 +1520,19 @@ namespace AzToolsFramework
             for (auto& entityIdLookup : m_entityIdManipulators.m_lookups)
             {
                 AZ::Transform worldFromLocal = AZ::Transform::CreateIdentity();
-                AZ::TransformBus::EventResult(
-                    worldFromLocal, entityIdLookup.first, &AZ::TransformBus::Events::GetWorldTM);
+                AZ::TransformBus::EventResult(worldFromLocal, entityIdLookup.first, &AZ::TransformBus::Events::GetWorldTM);
 
                 entityIdLookup.second.m_initial = worldFromLocal;
             }
 
             m_axisPreview.m_translation = m_entityIdManipulators.m_manipulators->GetLocalTransform().GetTranslation();
-            m_axisPreview.m_orientation = QuaternionFromTransformNoScaling(
-                m_entityIdManipulators.m_manipulators->GetLocalTransform());
+            m_axisPreview.m_orientation = QuaternionFromTransformNoScaling(m_entityIdManipulators.m_manipulators->GetLocalTransform());
         };
 
         auto uniformLeftMouseUpCallback = [this, manipulatorEntityIds]([[maybe_unused]] const LinearManipulator::Action& action)
         {
-            m_entityIdManipulators.m_manipulators->SetLocalTransform(
-                RecalculateAverageManipulatorTransform(
-                    m_entityIdManipulators.m_lookups, m_pivotOverrideFrame, m_pivotMode, m_referenceFrame));
+            m_entityIdManipulators.m_manipulators->SetLocalTransform(RecalculateAverageManipulatorTransform(
+                m_entityIdManipulators.m_lookups, m_pivotOverrideFrame, m_pivotMode, m_referenceFrame));
         };
 
         auto uniformLeftMouseMoveCallback = [this, manipulatorEntityIds](const LinearManipulator::Action& action)
@@ -1620,7 +1549,8 @@ namespace AzToolsFramework
                 const AZ::Transform initial = entityIdLookupIt->second.m_initial;
                 const float initialScale = initial.GetUniformScale();
 
-                const auto sumVectorElements = [](const AZ::Vector3& vec) {
+                const auto sumVectorElements = [](const AZ::Vector3& vec)
+                {
                     return vec.GetX() + vec.GetY() + vec.GetZ();
                 };
 
@@ -1630,19 +1560,16 @@ namespace AzToolsFramework
 
                 if (action.m_modifiers.Alt())
                 {
-                    const AZ::Transform pivotTransform = TransformNormalizedScale(
-                        entityIdLookupIt->second.m_initial);
-                    const AZ::Transform transformInPivotSpace =
-                        pivotTransform.GetInverse() * initial;
+                    const AZ::Transform pivotTransform = TransformNormalizedScale(entityIdLookupIt->second.m_initial);
+                    const AZ::Transform transformInPivotSpace = pivotTransform.GetInverse() * initial;
 
                     SetEntityWorldTransform(entityId, pivotTransform * scaleTransform * transformInPivotSpace);
                 }
                 else
                 {
-                    const AZ::Transform pivotTransform = TransformNormalizedScale(
-                        m_entityIdManipulators.m_manipulators->GetLocalTransform());
-                    const AZ::Transform transformInPivotSpace =
-                        pivotTransform.GetInverse() * initial;
+                    const AZ::Transform pivotTransform =
+                        TransformNormalizedScale(m_entityIdManipulators.m_manipulators->GetLocalTransform());
+                    const AZ::Transform transformInPivotSpace = pivotTransform.GetInverse() * initial;
 
                     SetEntityWorldTransform(entityId, pivotTransform * scaleTransform * transformInPivotSpace);
                 }
@@ -1674,11 +1601,10 @@ namespace AzToolsFramework
                 {
                     if (IsSelectableInViewport(entityId))
                     {
-                        const AZ::ComponentId  transformComponentId = GetTransformComponentId(entityId);
+                        const AZ::ComponentId transformComponentId = GetTransformComponentId(entityId);
                         if (transformComponentId != AZ::InvalidComponentId)
                         {
-                            manipulators.AddEntityComponentIdPair(
-                                AZ::EntityComponentIdPair(entityId, transformComponentId));
+                            manipulators.AddEntityComponentIdPair(AZ::EntityComponentIdPair(entityId, transformComponentId));
                             m_entityIdManipulators.m_lookups.insert_key(entityId);
                         }
                     }
@@ -1692,11 +1618,10 @@ namespace AzToolsFramework
             {
                 if (IsSelectableInViewport(entityId))
                 {
-                    const AZ::ComponentId  transformComponentId = GetTransformComponentId(entityId);
+                    const AZ::ComponentId transformComponentId = GetTransformComponentId(entityId);
                     if (transformComponentId != AZ::InvalidComponentId)
                     {
-                        manipulators.AddEntityComponentIdPair(
-                            AZ::EntityComponentIdPair(entityId, transformComponentId));
+                        manipulators.AddEntityComponentIdPair(AZ::EntityComponentIdPair(entityId, transformComponentId));
                         m_entityIdManipulators.m_lookups.insert_key(entityId);
                     }
                 }
@@ -1754,8 +1679,7 @@ namespace AzToolsFramework
                         CreateEntityManipulatorDeselectCommand(undoBatch);
                     }
 
-                    auto selectionCommand =
-                        AZStd::make_unique<SelectionCommand>(nextEntityIds, s_entityDeselectUndoRedoDesc);
+                    auto selectionCommand = AZStd::make_unique<SelectionCommand>(nextEntityIds, s_entityDeselectUndoRedoDesc);
                     selectionCommand->SetParent(undoBatch.GetUndoBatch());
                     selectionCommand.release();
 
@@ -1785,8 +1709,7 @@ namespace AzToolsFramework
         return false;
     }
 
-    bool EditorTransformComponentSelection::HandleMouseInteraction(
-        const ViewportInteraction::MouseInteractionEvent& mouseInteraction)
+    bool EditorTransformComponentSelection::HandleMouseInteraction(const ViewportInteraction::MouseInteractionEvent& mouseInteraction)
     {
         AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
 
@@ -1816,17 +1739,15 @@ namespace AzToolsFramework
             }
 
             AZ::Transform worldFromLocal;
-            AZ::TransformBus::EventResult(
-                worldFromLocal, entityId, &AZ::TransformBus::Events::GetWorldTM);
+            AZ::TransformBus::EventResult(worldFromLocal, entityId, &AZ::TransformBus::Events::GetWorldTM);
 
             const AZ::Vector3 boxPosition = worldFromLocal.TransformPoint(CalculateCenterOffset(entityId, m_pivotMode));
 
-            const AZ::Vector3 scaledSize = AZ::Vector3(s_pivotSize) *
-                CalculateScreenToWorldMultiplier(worldFromLocal.GetTranslation(), cameraState);
+            const AZ::Vector3 scaledSize =
+                AZ::Vector3(s_pivotSize) * CalculateScreenToWorldMultiplier(worldFromLocal.GetTranslation(), cameraState);
 
             if (AabbIntersectMouseRay(
-                mouseInteraction.m_mouseInteraction,
-                AZ::Aabb::CreateFromMinMax(boxPosition - scaledSize, boxPosition + scaledSize)))
+                    mouseInteraction.m_mouseInteraction, AZ::Aabb::CreateFromMinMax(boxPosition - scaledSize, boxPosition + scaledSize)))
             {
                 m_cachedEntityIdUnderCursor = entityId;
             }
@@ -1834,16 +1755,15 @@ namespace AzToolsFramework
 
         const AZ::EntityId entityIdUnderCursor = m_cachedEntityIdUnderCursor;
 
-        EditorContextMenuUpdate(
-            m_contextMenu, mouseInteraction);
+        EditorContextMenuUpdate(m_contextMenu, mouseInteraction);
 
         m_boxSelect.HandleMouseInteraction(mouseInteraction);
 
         if (Input::CycleManipulator(mouseInteraction))
         {
             const size_t scrollBound = 2;
-            const auto nextMode = (static_cast<int>(m_mode) + scrollBound +
-                (MouseWheelDelta(mouseInteraction) < 0.0f ? 1 : -1)) % scrollBound;
+            const auto nextMode =
+                (static_cast<int>(m_mode) + scrollBound + (MouseWheelDelta(mouseInteraction) < 0.0f ? 1 : -1)) % scrollBound;
 
             SetTransformMode(static_cast<Mode>(nextMode));
 
@@ -1883,8 +1803,7 @@ namespace AzToolsFramework
                 if (entityIdUnderCursor.IsValid())
                 {
                     AZ::Transform worldFromLocal = AZ::Transform::CreateIdentity();
-                    AZ::TransformBus::EventResult(
-                        worldFromLocal, entityIdUnderCursor, &AZ::TransformBus::Events::GetWorldTM);
+                    AZ::TransformBus::EventResult(worldFromLocal, entityIdUnderCursor, &AZ::TransformBus::Events::GetWorldTM);
 
                     switch (m_mode)
                     {
@@ -1912,8 +1831,7 @@ namespace AzToolsFramework
                 if (entityIdUnderCursor.IsValid())
                 {
                     AZ::Transform worldFromLocal = AZ::Transform::CreateIdentity();
-                    AZ::TransformBus::EventResult(
-                        worldFromLocal, entityIdUnderCursor, &AZ::TransformBus::Events::GetWorldTM);
+                    AZ::TransformBus::EventResult(worldFromLocal, entityIdUnderCursor, &AZ::TransformBus::Events::GetWorldTM);
 
                     switch (m_mode)
                     {
@@ -1938,15 +1856,14 @@ namespace AzToolsFramework
             // try snapping to the terrain (if in Translation mode) and entity wasn't picked
             if (Input::SnapTerrain(mouseInteraction))
             {
-                for(AZ::EntityId entityId : m_selectedEntityIds)
+                for (AZ::EntityId entityId : m_selectedEntityIds)
                 {
                     ScopedUndoBatch::MarkEntityDirty(entityId);
                 }
 
                 if (m_mode == Mode::Translation)
                 {
-                    const AZ::Vector3 finalSurfacePosition =
-                        PickTerrainPosition(mouseInteraction.m_mouseInteraction);
+                    const AZ::Vector3 finalSurfacePosition = PickTerrainPosition(mouseInteraction.m_mouseInteraction);
 
                     // handle modifier alternatives
                     if (Input::IndividualDitto(mouseInteraction))
@@ -1958,7 +1875,7 @@ namespace AzToolsFramework
                         CopyTranslationToSelectedEntitiesGroup(finalSurfacePosition);
                     }
                 }
-                else if(m_mode == Mode::Rotation)
+                else if (m_mode == Mode::Rotation)
                 {
                     // handle modifier alternatives
                     if (Input::IndividualDitto(mouseInteraction))
@@ -1981,14 +1898,13 @@ namespace AzToolsFramework
                 {
                     ScopedUndoBatch undoBatch(s_dittoManipulatorUndoRedoDesc);
 
-                    auto manipulatorCommand = AZStd::make_unique<EntityManipulatorCommand>(
-                        CreateManipulatorCommandStateFromSelf(), s_manipulatorUndoRedoName);
+                    auto manipulatorCommand =
+                        AZStd::make_unique<EntityManipulatorCommand>(CreateManipulatorCommandStateFromSelf(), s_manipulatorUndoRedoName);
 
                     if (entityIdUnderCursor.IsValid())
                     {
                         AZ::Transform worldFromLocal = AZ::Transform::CreateIdentity();
-                        AZ::TransformBus::EventResult(
-                            worldFromLocal, entityIdUnderCursor, &AZ::TransformBus::Events::GetWorldTM);
+                        AZ::TransformBus::EventResult(worldFromLocal, entityIdUnderCursor, &AZ::TransformBus::Events::GetWorldTM);
 
                         // set orientation/translation to match picked entity
                         switch (m_mode)
@@ -2029,13 +1945,9 @@ namespace AzToolsFramework
                         DelegateClearManipulatorOverride();
                     }
 
-                    manipulatorCommand->SetManipulatorAfter(
-                        EntityManipulatorCommand::State(
-                            BuildPivotOverride(
-                                m_pivotOverrideFrame.HasTranslationOverride(),
-                                m_pivotOverrideFrame.HasOrientationOverride()),
-                            m_entityIdManipulators.m_manipulators->GetLocalTransform(),
-                            entityIdUnderCursor));
+                    manipulatorCommand->SetManipulatorAfter(EntityManipulatorCommand::State(
+                        BuildPivotOverride(m_pivotOverrideFrame.HasTranslationOverride(), m_pivotOverrideFrame.HasOrientationOverride()),
+                        m_entityIdManipulators.m_manipulators->GetLocalTransform(), entityIdUnderCursor));
 
                     manipulatorCommand->SetParent(undoBatch.GetUndoBatch());
                     manipulatorCommand.release();
@@ -2073,9 +1985,7 @@ namespace AzToolsFramework
 
         QObject::connect(actions.back().get(), &QAction::triggered, actions.back().get(), callback);
 
-        EditorActionRequestBus::Broadcast(
-            &EditorActionRequests::AddActionViaBus,
-            actionId, actions.back().get());
+        EditorActionRequestBus::Broadcast(&EditorActionRequests::AddActionViaBus, actionId, actions.back().get());
     }
 
     void EditorTransformComponentSelection::OnEscape()
@@ -2090,18 +2000,17 @@ namespace AzToolsFramework
         AZ::ComponentApplicationBus::Broadcast(
             &AZ::ComponentApplicationRequests::EnumerateEntities,
             [&func](const AZ::Entity* entity)
-        {
-            const AZ::EntityId entityId = entity->GetId();
-
-            bool editorEntity = false;
-            EditorEntityContextRequestBus::BroadcastResult(
-                editorEntity, &EditorEntityContextRequests::IsEditorEntity, entityId);
-
-            if (editorEntity)
             {
-                func(entityId);
-            }
-        });
+                const AZ::EntityId entityId = entity->GetId();
+
+                bool editorEntity = false;
+                EditorEntityContextRequestBus::BroadcastResult(editorEntity, &EditorEntityContextRequests::IsEditorEntity, entityId);
+
+                if (editorEntity)
+                {
+                    func(entityId);
+                }
+            });
     }
 
     void EditorTransformComponentSelection::DelegateClearManipulatorOverride()
@@ -2149,22 +2058,22 @@ namespace AzToolsFramework
         };
 
         // lock selection
-        AddAction(m_actions, { QKeySequence(Qt::Key_L) },
-            /*ID_EDIT_FREEZE =*/ 32900,
-            s_lockSelectionTitle, s_lockSelectionDesc,
+        AddAction(
+            m_actions, { QKeySequence(Qt::Key_L) },
+            /*ID_EDIT_FREEZE =*/32900, s_lockSelectionTitle, s_lockSelectionDesc,
             [lockUnlock]()
-        {
-            lockUnlock(true);
-        });
+            {
+                lockUnlock(true);
+            });
 
         // unlock selection
-        AddAction(m_actions, { QKeySequence(Qt::CTRL + Qt::Key_L) },
-            /*ID_EDIT_UNFREEZE =*/ 32973,
-            s_lockSelectionTitle, s_lockSelectionDesc,
+        AddAction(
+            m_actions, { QKeySequence(Qt::CTRL + Qt::Key_L) },
+            /*ID_EDIT_UNFREEZE =*/32973, s_lockSelectionTitle, s_lockSelectionDesc,
             [lockUnlock]()
-        {
-            lockUnlock(false);
-        });
+            {
+                lockUnlock(false);
+            });
 
         const auto showHide = [this](const bool show)
         {
@@ -2189,298 +2098,284 @@ namespace AzToolsFramework
         };
 
         // hide selection
-        AddAction(m_actions, { QKeySequence(Qt::Key_H) },
-            /*ID_EDIT_HIDE =*/ 32898,
-            s_hideSelectionTitle, s_hideSelectionDesc,
+        AddAction(
+            m_actions, { QKeySequence(Qt::Key_H) },
+            /*ID_EDIT_HIDE =*/32898, s_hideSelectionTitle, s_hideSelectionDesc,
             [showHide]()
-        {
-            showHide(false);
-        });
+            {
+                showHide(false);
+            });
 
         // show selection
-        AddAction(m_actions, { QKeySequence(Qt::CTRL + Qt::Key_H) },
-            /*ID_EDIT_UNHIDE =*/ 32974,
-            s_hideSelectionTitle, s_hideSelectionDesc,
+        AddAction(
+            m_actions, { QKeySequence(Qt::CTRL + Qt::Key_H) },
+            /*ID_EDIT_UNHIDE =*/32974, s_hideSelectionTitle, s_hideSelectionDesc,
             [showHide]()
-        {
-            showHide(true);
-        });
+            {
+                showHide(true);
+            });
 
         // unlock all entities in the level/scene
-        AddAction(m_actions, { QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_L) },
-            /*ID_EDIT_UNFREEZEALL =*/ 32901,
-            s_unlockAllTitle, s_unlockAllDesc,
+        AddAction(
+            m_actions, { QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_L) },
+            /*ID_EDIT_UNFREEZEALL =*/32901, s_unlockAllTitle, s_unlockAllDesc,
             []()
-        {
-            AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
-
-            ScopedUndoBatch undoBatch(s_unlockAllUndoRedoDesc);
-
-            EnumerateEditorEntities([](AZ::EntityId entityId)
             {
-                ScopedUndoBatch::MarkEntityDirty(entityId);
-                SetEntityLockState(entityId, false);
+                AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
+
+                ScopedUndoBatch undoBatch(s_unlockAllUndoRedoDesc);
+
+                EnumerateEditorEntities(
+                    [](AZ::EntityId entityId)
+                    {
+                        ScopedUndoBatch::MarkEntityDirty(entityId);
+                        SetEntityLockState(entityId, false);
+                    });
             });
-        });
 
         // show all entities in the level/scene
-        AddAction(m_actions, { QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_H) },
-            /*ID_EDIT_UNHIDEALL =*/ 32899,
-            s_showAllTitle, s_showAllDesc,
+        AddAction(
+            m_actions, { QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_H) },
+            /*ID_EDIT_UNHIDEALL =*/32899, s_showAllTitle, s_showAllDesc,
             []()
-        {
-            AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
-
-            ScopedUndoBatch undoBatch(s_showAllEntitiesUndoRedoDesc);
-
-            EnumerateEditorEntities([](AZ::EntityId entityId)
             {
-                ScopedUndoBatch::MarkEntityDirty(entityId);
-                SetEntityVisibility(entityId, true);
+                AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
+
+                ScopedUndoBatch undoBatch(s_showAllEntitiesUndoRedoDesc);
+
+                EnumerateEditorEntities(
+                    [](AZ::EntityId entityId)
+                    {
+                        ScopedUndoBatch::MarkEntityDirty(entityId);
+                        SetEntityVisibility(entityId, true);
+                    });
             });
-        });
 
         // select all entities in the level/scene
-        AddAction(m_actions, { QKeySequence(Qt::CTRL + Qt::Key_A) },
-            /*ID_EDIT_SELECTALL =*/ 33376,
-            s_selectAllTitle, s_selectAllDesc,
+        AddAction(
+            m_actions, { QKeySequence(Qt::CTRL + Qt::Key_A) },
+            /*ID_EDIT_SELECTALL =*/33376, s_selectAllTitle, s_selectAllDesc,
             [this]()
-        {
-            AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
-
-            ScopedUndoBatch undoBatch(s_selectAllEntitiesUndoRedoDesc);
-
-            if (m_entityIdManipulators.m_manipulators)
             {
-                auto manipulatorCommand = AZStd::make_unique<EntityManipulatorCommand>(
-                    CreateManipulatorCommandStateFromSelf(), s_manipulatorUndoRedoName);
+                AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
 
-                // note, nothing will change that the manipulatorCommand needs to keep track
-                // for after so no need to call SetManipulatorAfter
+                ScopedUndoBatch undoBatch(s_selectAllEntitiesUndoRedoDesc);
 
-                manipulatorCommand->SetParent(undoBatch.GetUndoBatch());
-                manipulatorCommand.release();
-            }
-
-            EnumerateEditorEntities([this](AZ::EntityId entityId)
-            {
-                if (IsSelectableInViewport(entityId))
+                if (m_entityIdManipulators.m_manipulators)
                 {
-                    AddEntityToSelection(entityId);
+                    auto manipulatorCommand =
+                        AZStd::make_unique<EntityManipulatorCommand>(CreateManipulatorCommandStateFromSelf(), s_manipulatorUndoRedoName);
+
+                    // note, nothing will change that the manipulatorCommand needs to keep track
+                    // for after so no need to call SetManipulatorAfter
+
+                    manipulatorCommand->SetParent(undoBatch.GetUndoBatch());
+                    manipulatorCommand.release();
                 }
+
+                EnumerateEditorEntities(
+                    [this](AZ::EntityId entityId)
+                    {
+                        if (IsSelectableInViewport(entityId))
+                        {
+                            AddEntityToSelection(entityId);
+                        }
+                    });
+
+                auto nextEntityIds = EntityIdVectorFromContainer(m_selectedEntityIds);
+
+                auto selectionCommand = AZStd::make_unique<SelectionCommand>(nextEntityIds, s_selectAllEntitiesUndoRedoDesc);
+                selectionCommand->SetParent(undoBatch.GetUndoBatch());
+                selectionCommand.release();
+
+                SetSelectedEntities(nextEntityIds);
+                RegenerateManipulators();
             });
 
-            auto nextEntityIds = EntityIdVectorFromContainer(m_selectedEntityIds);
-
-            auto selectionCommand = AZStd::make_unique<SelectionCommand>(
-                nextEntityIds, s_selectAllEntitiesUndoRedoDesc);
-            selectionCommand->SetParent(undoBatch.GetUndoBatch());
-            selectionCommand.release();
-
-            SetSelectedEntities(nextEntityIds);
-            RegenerateManipulators();
-        });
-
         // invert current selection
-        AddAction(m_actions, { QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_I) },
-            /*ID_EDIT_INVERTSELECTION =*/ 33692,
-            s_invertSelectionTitle, s_invertSelectionDesc,
+        AddAction(
+            m_actions, { QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_I) },
+            /*ID_EDIT_INVERTSELECTION =*/33692, s_invertSelectionTitle, s_invertSelectionDesc,
             [this]()
-        {
-            AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
-
-            ScopedUndoBatch undoBatch(s_invertSelectionUndoRedoDesc);
-
-            if (m_entityIdManipulators.m_manipulators)
             {
-                auto manipulatorCommand = AZStd::make_unique<EntityManipulatorCommand>(
-                    CreateManipulatorCommandStateFromSelf(), s_manipulatorUndoRedoName);
+                AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
 
-                // note, nothing will change that the manipulatorCommand needs to keep track
-                // for after so no need to call SetManipulatorAfter
+                ScopedUndoBatch undoBatch(s_invertSelectionUndoRedoDesc);
 
-                manipulatorCommand->SetParent(undoBatch.GetUndoBatch());
-                manipulatorCommand.release();
-            }
-
-            EntityIdSet entityIds;
-            EnumerateEditorEntities([this, &entityIds](AZ::EntityId entityId)
-            {
-                const auto entityIdIt = AZStd::find(m_selectedEntityIds.begin(), m_selectedEntityIds.end(), entityId);
-                if (entityIdIt == m_selectedEntityIds.end())
+                if (m_entityIdManipulators.m_manipulators)
                 {
-                    if (IsSelectableInViewport(entityId))
-                    {
-                        entityIds.insert(entityId);
-                    }
+                    auto manipulatorCommand =
+                        AZStd::make_unique<EntityManipulatorCommand>(CreateManipulatorCommandStateFromSelf(), s_manipulatorUndoRedoName);
+
+                    // note, nothing will change that the manipulatorCommand needs to keep track
+                    // for after so no need to call SetManipulatorAfter
+
+                    manipulatorCommand->SetParent(undoBatch.GetUndoBatch());
+                    manipulatorCommand.release();
                 }
+
+                EntityIdSet entityIds;
+                EnumerateEditorEntities(
+                    [this, &entityIds](AZ::EntityId entityId)
+                    {
+                        const auto entityIdIt = AZStd::find(m_selectedEntityIds.begin(), m_selectedEntityIds.end(), entityId);
+                        if (entityIdIt == m_selectedEntityIds.end())
+                        {
+                            if (IsSelectableInViewport(entityId))
+                            {
+                                entityIds.insert(entityId);
+                            }
+                        }
+                    });
+
+                m_selectedEntityIds = entityIds;
+
+                auto nextEntityIds = EntityIdVectorFromContainer(entityIds);
+
+                auto selectionCommand = AZStd::make_unique<SelectionCommand>(nextEntityIds, s_invertSelectionUndoRedoDesc);
+                selectionCommand->SetParent(undoBatch.GetUndoBatch());
+                selectionCommand.release();
+
+                SetSelectedEntities(nextEntityIds);
+                RegenerateManipulators();
             });
 
-            m_selectedEntityIds = entityIds;
+        // duplicate selection
+        AddAction(
+            m_actions, { QKeySequence(Qt::CTRL + Qt::Key_D) },
+            /*ID_EDIT_CLONE =*/33525, s_duplicateTitle, s_duplicateDesc,
+            []()
+            {
+                AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
 
-            auto nextEntityIds = EntityIdVectorFromContainer(entityIds);
+                // Clear Widget selection - Prevents issues caused by cloning entities while a property in the Reflected Property Editor
+                // is being edited.
+                if (QApplication::focusWidget())
+                {
+                    QApplication::focusWidget()->clearFocus();
+                }
 
-            auto selectionCommand = AZStd::make_unique<SelectionCommand>(nextEntityIds, s_invertSelectionUndoRedoDesc);
-            selectionCommand->SetParent(undoBatch.GetUndoBatch());
-            selectionCommand.release();
+                ScopedUndoBatch undoBatch(s_duplicateUndoRedoDesc);
+                auto selectionCommand = AZStd::make_unique<SelectionCommand>(EntityIdList(), s_duplicateUndoRedoDesc);
+                selectionCommand->SetParent(undoBatch.GetUndoBatch());
+                selectionCommand.release();
 
-            SetSelectedEntities(nextEntityIds);
-            RegenerateManipulators();
-        });
+                bool handled = false;
+                EditorRequestBus::Broadcast(&EditorRequests::CloneSelection, handled);
 
-        bool isPrefabSystemEnabled = false;
-        AzFramework::ApplicationRequests::Bus::BroadcastResult(
-            isPrefabSystemEnabled, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
-
-        bool prefabWipFeaturesEnabled = false;
-        AzFramework::ApplicationRequests::Bus::BroadcastResult(
-            prefabWipFeaturesEnabled, &AzFramework::ApplicationRequests::ArePrefabWipFeaturesEnabled);
-
-        if (!isPrefabSystemEnabled || (isPrefabSystemEnabled && prefabWipFeaturesEnabled))
-        {
-            // duplicate selection
-            AddAction(
-                m_actions, {QKeySequence(Qt::CTRL + Qt::Key_D)},
-                /*ID_EDIT_CLONE =*/33525, s_duplicateTitle, s_duplicateDesc, []() {
-                    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
-
-                    // Clear Widget selection - Prevents issues caused by cloning entities while a property in the Reflected Property Editor
-                    // is being edited.
-                    if (QApplication::focusWidget())
-                    {
-                        QApplication::focusWidget()->clearFocus();
-                    }
-
-                    ScopedUndoBatch undoBatch(s_duplicateUndoRedoDesc);
-                    auto selectionCommand = AZStd::make_unique<SelectionCommand>(EntityIdList(), s_duplicateUndoRedoDesc);
-                    selectionCommand->SetParent(undoBatch.GetUndoBatch());
-                    selectionCommand.release();
-
-                    bool handled = false;
-                    EditorRequestBus::Broadcast(&EditorRequests::CloneSelection, handled);
-
-                    // selection update handled in AfterEntitySelectionChanged
-                });
-        }
+                // selection update handled in AfterEntitySelectionChanged
+            });
 
         // delete selection
         AddAction(
             m_actions, { QKeySequence(Qt::Key_Delete) },
-            /*ID_EDIT_DELETE=*/ 33480,
-            s_deleteTitle, s_deleteDesc,
+            /*ID_EDIT_DELETE=*/33480, s_deleteTitle, s_deleteDesc,
             [this]()
-        {
-            AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
+            {
+                AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
 
-            ScopedUndoBatch undoBatch(s_deleteUndoRedoDesc);
+                ScopedUndoBatch undoBatch(s_deleteUndoRedoDesc);
 
-            CreateEntityManipulatorDeselectCommand(undoBatch);
+                CreateEntityManipulatorDeselectCommand(undoBatch);
 
-            ToolsApplicationRequestBus::Broadcast(
-                &ToolsApplicationRequests::DeleteEntitiesAndAllDescendants,
-                EntityIdVectorFromContainer(m_selectedEntityIds));
+                ToolsApplicationRequestBus::Broadcast(
+                    &ToolsApplicationRequests::DeleteEntitiesAndAllDescendants, EntityIdVectorFromContainer(m_selectedEntityIds));
 
-            m_selectedEntityIds.clear();
-            m_pivotOverrideFrame.Reset();
-        });
+                m_selectedEntityIds.clear();
+                m_pivotOverrideFrame.Reset();
+            });
 
         AddAction(
             m_actions, { QKeySequence(Qt::Key_Space) },
-            /*ID_EDIT_ESCAPE=*/ 33513,
-            "", "",
+            /*ID_EDIT_ESCAPE=*/33513, "", "",
             [this]()
-        {
-            DeselectEntities();
-        });
+            {
+                DeselectEntities();
+            });
 
         AddAction(
             m_actions, { QKeySequence(Qt::Key_P) },
-            /*ID_EDIT_PIVOT=*/ 36203,
-            s_togglePivotTitleEditMenu, s_togglePivotDesc,
+            /*ID_EDIT_PIVOT=*/36203, s_togglePivotTitleEditMenu, s_togglePivotDesc,
             [this]()
-        {
-            ToggleCenterPivotSelection();
-        });
+            {
+                ToggleCenterPivotSelection();
+            });
 
         AddAction(
             m_actions, { QKeySequence(Qt::Key_R) },
-            /*ID_EDIT_RESET=*/ 36204,
-            s_resetEntityTransformTitle, s_resetEntityTransformDesc,
+            /*ID_EDIT_RESET=*/36204, s_resetEntityTransformTitle, s_resetEntityTransformDesc,
             [this]()
-        {
-            switch (m_mode)
             {
-            case Mode::Rotation:
-                ResetOrientationForSelectedEntitiesLocal();
-                break;
-            case Mode::Scale:
-                CopyScaleToSelectedEntitiesIndividualLocal(1.0f);
-                break;
-            case Mode::Translation:
-                ResetTranslationForSelectedEntitiesLocal();
-                break;
-            }
-        });
+                switch (m_mode)
+                {
+                case Mode::Rotation:
+                    ResetOrientationForSelectedEntitiesLocal();
+                    break;
+                case Mode::Scale:
+                    CopyScaleToSelectedEntitiesIndividualLocal(1.0f);
+                    break;
+                case Mode::Translation:
+                    ResetTranslationForSelectedEntitiesLocal();
+                    break;
+                }
+            });
 
         AddAction(
             m_actions, { QKeySequence(Qt::CTRL + Qt::Key_R) },
-            /*ID_EDIT_RESET_MANIPULATOR=*/ 36207,
-            s_resetManipulatorTitle, s_resetManipulatorDesc,
+            /*ID_EDIT_RESET_MANIPULATOR=*/36207, s_resetManipulatorTitle, s_resetManipulatorDesc,
             AZStd::bind(AZStd::mem_fn(&EditorTransformComponentSelection::DelegateClearManipulatorOverride), this));
 
         AddAction(
             m_actions, { QKeySequence(Qt::ALT + Qt::Key_R) },
-            /*ID_EDIT_RESET_LOCAL=*/ 36205,
-            s_resetTransformLocalTitle, s_resetTransformLocalDesc,
+            /*ID_EDIT_RESET_LOCAL=*/36205, s_resetTransformLocalTitle, s_resetTransformLocalDesc,
             [this]()
-        {
-            switch (m_mode)
             {
-            case Mode::Rotation:
-                ResetOrientationForSelectedEntitiesLocal();
-                break;
-            case Mode::Scale:
-                CopyScaleToSelectedEntitiesIndividualWorld(1.0f);
-                break;
-            case Mode::Translation:
-                // do nothing
-                break;
-            }
-        });
+                switch (m_mode)
+                {
+                case Mode::Rotation:
+                    ResetOrientationForSelectedEntitiesLocal();
+                    break;
+                case Mode::Scale:
+                    CopyScaleToSelectedEntitiesIndividualWorld(1.0f);
+                    break;
+                case Mode::Translation:
+                    // do nothing
+                    break;
+                }
+            });
 
         AddAction(
             m_actions, { QKeySequence(Qt::SHIFT + Qt::Key_R) },
-            /*ID_EDIT_RESET_WORLD=*/ 36206,
-            s_resetTransformWorldTitle, s_resetTransformWorldDesc,
+            /*ID_EDIT_RESET_WORLD=*/36206, s_resetTransformWorldTitle, s_resetTransformWorldDesc,
             [this]()
-        {
-            switch (m_mode)
             {
-            case Mode::Rotation:
+                switch (m_mode)
                 {
-                    // begin an undo batch so operations inside CopyOrientation... and
-                    // DelegateClear... are grouped into a single undo/redo
-                    ScopedUndoBatch undoBatch { s_resetTransformWorldTitle };
-                    CopyOrientationToSelectedEntitiesIndividual(AZ::Quaternion::CreateIdentity());
-                    ClearManipulatorOrientationOverride();
+                case Mode::Rotation:
+                    {
+                        // begin an undo batch so operations inside CopyOrientation... and
+                        // DelegateClear... are grouped into a single undo/redo
+                        ScopedUndoBatch undoBatch{ s_resetTransformWorldTitle };
+                        CopyOrientationToSelectedEntitiesIndividual(AZ::Quaternion::CreateIdentity());
+                        ClearManipulatorOrientationOverride();
+                    }
+                    break;
+                case Mode::Scale:
+                case Mode::Translation:
+                    break;
                 }
-                break;
-            case Mode::Scale:
-            case Mode::Translation:
-                break;
-            }
-        });
-        
+            });
+
         AddAction(
             m_actions, { QKeySequence(Qt::Key_U) },
             /*ID_VIEWPORTUI_VISIBLE=*/50040, "Toggle ViewportUI", "Hide/Unhide Viewport UI",
-           [this]()
-        {
+            [this]()
+            {
                 SetViewportUiClusterVisible(m_transformModeClusterId, !m_viewportUiVisible);
                 SetViewportUiClusterVisible(m_spaceCluster.m_spaceClusterId, !m_viewportUiVisible);
                 m_viewportUiVisible = !m_viewportUiVisible;
-        });
-       
+            });
+
         EditorMenuRequestBus::Broadcast(&EditorMenuRequests::RestoreEditMenuToDefault);
     }
 
@@ -2488,8 +2383,7 @@ namespace AzToolsFramework
     {
         for (auto& action : m_actions)
         {
-            EditorActionRequestBus::Broadcast(
-                &EditorActionRequests::RemoveActionViaBus, action.get());
+            EditorActionRequestBus::Broadcast(&EditorActionRequests::RemoveActionViaBus, action.get());
         }
 
         m_actions.clear();
@@ -2558,42 +2452,37 @@ namespace AzToolsFramework
     {
         // create the cluster for changing transform mode
         ViewportUi::ViewportUiRequestBus::EventResult(
-            m_transformModeClusterId, ViewportUi::DefaultViewportId,
-            &ViewportUi::ViewportUiRequestBus::Events::CreateCluster, ViewportUi::Alignment::TopLeft);
+            m_transformModeClusterId, ViewportUi::DefaultViewportId, &ViewportUi::ViewportUiRequestBus::Events::CreateCluster,
+            ViewportUi::Alignment::TopLeft);
 
         // create and register the buttons (strings correspond to icons even if the values appear different)
         m_translateButtonId = RegisterClusterButton(m_transformModeClusterId, "Move");
         m_rotateButtonId = RegisterClusterButton(m_transformModeClusterId, "Translate");
         m_scaleButtonId = RegisterClusterButton(m_transformModeClusterId, "Scale");
 
-        auto onButtonClicked =
-            [this](ViewportUi::ButtonId buttonId)
+        auto onButtonClicked = [this](ViewportUi::ButtonId buttonId)
+        {
+            if (buttonId == m_translateButtonId)
             {
-                if (buttonId == m_translateButtonId)
-                {
-                    SetTransformMode(Mode::Translation);
-                }
-                else if (buttonId == m_rotateButtonId)
-                {
-                    SetTransformMode(Mode::Rotation);
-                }
-                else if (buttonId == m_scaleButtonId)
-                {
-                    SetTransformMode(Mode::Scale);
-                }
-            };
+                SetTransformMode(Mode::Translation);
+            }
+            else if (buttonId == m_rotateButtonId)
+            {
+                SetTransformMode(Mode::Rotation);
+            }
+            else if (buttonId == m_scaleButtonId)
+            {
+                SetTransformMode(Mode::Scale);
+            }
+        };
 
         m_transformModeSelectionHandler = AZ::Event<ViewportUi::ButtonId>::Handler(onButtonClicked);
 
         ViewportUi::ViewportUiRequestBus::Event(
-            ViewportUi::DefaultViewportId,
-            &ViewportUi::ViewportUiRequestBus::Events::SetClusterActiveButton,
-            m_transformModeClusterId,
+            ViewportUi::DefaultViewportId, &ViewportUi::ViewportUiRequestBus::Events::SetClusterActiveButton, m_transformModeClusterId,
             m_translateButtonId);
         ViewportUi::ViewportUiRequestBus::Event(
-            ViewportUi::DefaultViewportId,
-            &ViewportUi::ViewportUiRequestBus::Events::RegisterClusterEventHandler,
-            m_transformModeClusterId,
+            ViewportUi::DefaultViewportId, &ViewportUi::ViewportUiRequestBus::Events::RegisterClusterEventHandler, m_transformModeClusterId,
             m_transformModeSelectionHandler);
     }
 
@@ -2609,7 +2498,8 @@ namespace AzToolsFramework
         m_spaceCluster.m_parentButtonId = RegisterClusterButton(m_spaceCluster.m_spaceClusterId, "Parent");
         m_spaceCluster.m_localButtonId = RegisterClusterButton(m_spaceCluster.m_spaceClusterId, "Local");
 
-        auto onButtonClicked = [this](ViewportUi::ButtonId buttonId) {
+        auto onButtonClicked = [this](ViewportUi::ButtonId buttonId)
+        {
             if (buttonId == m_spaceCluster.m_localButtonId)
             {
                 // Unlock
@@ -2646,6 +2536,9 @@ namespace AzToolsFramework
                     m_spaceCluster.m_spaceLock = ReferenceFrame::World;
                 }
             }
+            ViewportUi::ViewportUiRequestBus::Event(
+                ViewportUi::DefaultViewportId, &ViewportUi::ViewportUiRequestBus::Events::SetClusterButtonLocked,
+                m_spaceCluster.m_spaceClusterId, buttonId, m_spaceCluster.m_spaceLock.has_value());
         };
 
         m_spaceCluster.m_spaceSelectionHandler = AZ::Event<ViewportUi::ButtonId>::Handler(onButtonClicked);
@@ -2671,14 +2564,13 @@ namespace AzToolsFramework
 
         if (m_pivotOverrideFrame.m_orientationOverride && m_entityIdManipulators.m_manipulators)
         {
-            m_pivotOverrideFrame.m_orientationOverride = QuaternionFromTransformNoScaling(
-                m_entityIdManipulators.m_manipulators->GetLocalTransform());
+            m_pivotOverrideFrame.m_orientationOverride =
+                QuaternionFromTransformNoScaling(m_entityIdManipulators.m_manipulators->GetLocalTransform());
         }
 
         if (m_pivotOverrideFrame.m_translationOverride && m_entityIdManipulators.m_manipulators)
         {
-            m_pivotOverrideFrame.m_translationOverride =
-                m_entityIdManipulators.m_manipulators->GetLocalTransform().GetTranslation();
+            m_pivotOverrideFrame.m_translationOverride = m_entityIdManipulators.m_manipulators->GetLocalTransform().GetTranslation();
         }
 
         m_mode = mode;
@@ -2755,8 +2647,7 @@ namespace AzToolsFramework
 
         // we are responsible for updating the current selection
         m_didSetSelectedEntities = true;
-        ToolsApplicationRequestBus::Broadcast(
-            &ToolsApplicationRequests::SetSelectedEntities, entityIds);
+        ToolsApplicationRequestBus::Broadcast(&ToolsApplicationRequests::SetSelectedEntities, entityIds);
     }
 
     void EditorTransformComponentSelection::RefreshManipulators(const RefreshType refreshType)
@@ -2776,15 +2667,13 @@ namespace AzToolsFramework
                     break;
                 case RefreshType::Orientation:
                     transform = AZ::Transform::CreateFromQuaternionAndTranslation(
-                        RecalculateAverageManipulatorOrientation(
-                            m_entityIdManipulators.m_lookups, m_pivotOverrideFrame, m_referenceFrame),
+                        RecalculateAverageManipulatorOrientation(m_entityIdManipulators.m_lookups, m_pivotOverrideFrame, m_referenceFrame),
                         m_entityIdManipulators.m_manipulators->GetLocalTransform().GetTranslation());
                     break;
                 case RefreshType::Translation:
                     transform = AZ::Transform::CreateFromQuaternionAndTranslation(
                         m_entityIdManipulators.m_manipulators->GetLocalTransform().GetRotation(),
-                        RecalculateAverageManipulatorTranslation(
-                            m_entityIdManipulators.m_lookups, m_pivotOverrideFrame, m_pivotMode));
+                        RecalculateAverageManipulatorTranslation(m_entityIdManipulators.m_lookups, m_pivotOverrideFrame, m_pivotMode));
                     break;
                 }
 
@@ -2807,9 +2696,8 @@ namespace AzToolsFramework
 
         if (m_entityIdManipulators.m_manipulators)
         {
-            m_entityIdManipulators.m_manipulators->SetLocalTransform(
-                AZ::Transform::CreateFromQuaternionAndTranslation(
-                    orientation, m_entityIdManipulators.m_manipulators->GetLocalTransform().GetTranslation()));
+            m_entityIdManipulators.m_manipulators->SetLocalTransform(AZ::Transform::CreateFromQuaternionAndTranslation(
+                orientation, m_entityIdManipulators.m_manipulators->GetLocalTransform().GetTranslation()));
 
             m_entityIdManipulators.m_manipulators->SetBoundsDirty();
         }
@@ -2836,15 +2724,14 @@ namespace AzToolsFramework
         {
             ScopedUndoBatch undoBatch(s_resetManipulatorTranslationUndoRedoDesc);
 
-            auto manipulatorCommand = AZStd::make_unique<EntityManipulatorCommand>(
-                CreateManipulatorCommandStateFromSelf(), s_manipulatorUndoRedoName);
+            auto manipulatorCommand =
+                AZStd::make_unique<EntityManipulatorCommand>(CreateManipulatorCommandStateFromSelf(), s_manipulatorUndoRedoName);
 
             m_pivotOverrideFrame.ResetPickedTranslation();
             m_pivotOverrideFrame.m_pickedEntityIdOverride.SetInvalid();
 
-            m_entityIdManipulators.m_manipulators->SetLocalTransform(
-                RecalculateAverageManipulatorTransform(
-                    m_entityIdManipulators.m_lookups, m_pivotOverrideFrame, m_pivotMode, m_referenceFrame));
+            m_entityIdManipulators.m_manipulators->SetLocalTransform(RecalculateAverageManipulatorTransform(
+                m_entityIdManipulators.m_lookups, m_pivotOverrideFrame, m_pivotMode, m_referenceFrame));
 
             m_entityIdManipulators.m_manipulators->SetBoundsDirty();
 
@@ -2861,20 +2748,18 @@ namespace AzToolsFramework
 
         if (m_entityIdManipulators.m_manipulators)
         {
-            ScopedUndoBatch undoBatch { s_resetManipulatorOrientationUndoRedoDesc };
+            ScopedUndoBatch undoBatch{ s_resetManipulatorOrientationUndoRedoDesc };
 
-            auto manipulatorCommand = AZStd::make_unique<EntityManipulatorCommand>(
-                CreateManipulatorCommandStateFromSelf(), s_manipulatorUndoRedoName);
+            auto manipulatorCommand =
+                AZStd::make_unique<EntityManipulatorCommand>(CreateManipulatorCommandStateFromSelf(), s_manipulatorUndoRedoName);
 
             m_pivotOverrideFrame.ResetPickedOrientation();
             m_pivotOverrideFrame.m_pickedEntityIdOverride.SetInvalid();
 
             // parent reference frame is the default (when no modifiers are held)
-            m_entityIdManipulators.m_manipulators->SetLocalTransform(
-                AZ::Transform::CreateFromQuaternionAndTranslation(
-                    ETCS::CalculatePivotOrientationForEntityIds(
-                        m_entityIdManipulators.m_lookups, ReferenceFrame::Parent).m_worldOrientation,
-                    m_entityIdManipulators.m_manipulators->GetLocalTransform().GetTranslation()));
+            m_entityIdManipulators.m_manipulators->SetLocalTransform(AZ::Transform::CreateFromQuaternionAndTranslation(
+                ETCS::CalculatePivotOrientationForEntityIds(m_entityIdManipulators.m_lookups, ReferenceFrame::Parent).m_worldOrientation,
+                m_entityIdManipulators.m_manipulators->GetLocalTransform().GetTranslation()));
 
             m_entityIdManipulators.m_manipulators->SetBoundsDirty();
 
@@ -2897,8 +2782,7 @@ namespace AzToolsFramework
     {
         AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
 
-        static_assert(AZStd::is_same<typename EntityIdMap::key_type, AZ::EntityId>::value,
-            "Container key type is not an EntityId");
+        static_assert(AZStd::is_same<typename EntityIdMap::key_type, AZ::EntityId>::value, "Container key type is not an EntityId");
 
         AZ::EntityId parentId;
         AZ::TransformBus::EventResult(parentId, entityId, &AZ::TransformBus::Events::GetParentId);
@@ -2932,11 +2816,10 @@ namespace AzToolsFramework
             ScopedUndoBatch undoBatch(s_dittoTranslationGroupUndoRedoDesc);
 
             // store previous translation manipulator position
-            const AZ::Vector3 previousPivotTranslation =
-                m_entityIdManipulators.m_manipulators->GetLocalTransform().GetTranslation();
+            const AZ::Vector3 previousPivotTranslation = m_entityIdManipulators.m_manipulators->GetLocalTransform().GetTranslation();
 
-            auto manipulatorCommand = AZStd::make_unique<EntityManipulatorCommand>(
-                CreateManipulatorCommandStateFromSelf(), s_manipulatorUndoRedoName);
+            auto manipulatorCommand =
+                AZStd::make_unique<EntityManipulatorCommand>(CreateManipulatorCommandStateFromSelf(), s_manipulatorUndoRedoName);
 
             // refresh the transform pivot override if it's set
             if (m_pivotOverrideFrame.m_translationOverride)
@@ -2944,15 +2827,11 @@ namespace AzToolsFramework
                 OverrideManipulatorTranslation(translation);
             }
 
-            manipulatorCommand->SetManipulatorAfter(
-                EntityManipulatorCommand::State(
-                    BuildPivotOverride(
-                        m_pivotOverrideFrame.HasTranslationOverride(),
-                        m_pivotOverrideFrame.HasOrientationOverride()),
-                    AZ::Transform::CreateFromQuaternionAndTranslation(
-                        QuaternionFromTransformNoScaling(
-                            m_entityIdManipulators.m_manipulators->GetLocalTransform()), translation),
-                    m_pivotOverrideFrame.m_pickedEntityIdOverride));
+            manipulatorCommand->SetManipulatorAfter(EntityManipulatorCommand::State(
+                BuildPivotOverride(m_pivotOverrideFrame.HasTranslationOverride(), m_pivotOverrideFrame.HasOrientationOverride()),
+                AZ::Transform::CreateFromQuaternionAndTranslation(
+                    QuaternionFromTransformNoScaling(m_entityIdManipulators.m_manipulators->GetLocalTransform()), translation),
+                m_pivotOverrideFrame.m_pickedEntityIdOverride));
 
             manipulatorCommand->SetParent(undoBatch.GetUndoBatch());
             manipulatorCommand.release();
@@ -2992,8 +2871,8 @@ namespace AzToolsFramework
         {
             ScopedUndoBatch undoBatch(s_dittoTranslationIndividualUndoRedoDesc);
 
-            auto manipulatorCommand = AZStd::make_unique<EntityManipulatorCommand>(
-                CreateManipulatorCommandStateFromSelf(), s_manipulatorUndoRedoName);
+            auto manipulatorCommand =
+                AZStd::make_unique<EntityManipulatorCommand>(CreateManipulatorCommandStateFromSelf(), s_manipulatorUndoRedoName);
 
             // refresh the transform pivot override if it's set
             if (m_pivotOverrideFrame.m_translationOverride)
@@ -3001,15 +2880,11 @@ namespace AzToolsFramework
                 OverrideManipulatorTranslation(translation);
             }
 
-            manipulatorCommand->SetManipulatorAfter(
-                EntityManipulatorCommand::State(
-                    BuildPivotOverride(
-                        m_pivotOverrideFrame.HasTranslationOverride(),
-                        m_pivotOverrideFrame.HasOrientationOverride()),
-                    AZ::Transform::CreateFromQuaternionAndTranslation(
-                        QuaternionFromTransformNoScaling(
-                            m_entityIdManipulators.m_manipulators->GetLocalTransform()), translation),
-                    m_pivotOverrideFrame.m_pickedEntityIdOverride));
+            manipulatorCommand->SetManipulatorAfter(EntityManipulatorCommand::State(
+                BuildPivotOverride(m_pivotOverrideFrame.HasTranslationOverride(), m_pivotOverrideFrame.HasOrientationOverride()),
+                AZ::Transform::CreateFromQuaternionAndTranslation(
+                    QuaternionFromTransformNoScaling(m_entityIdManipulators.m_manipulators->GetLocalTransform()), translation),
+                m_pivotOverrideFrame.m_pickedEntityIdOverride));
 
             manipulatorCommand->SetParent(undoBatch.GetUndoBatch());
             manipulatorCommand.release();
@@ -3081,17 +2956,16 @@ namespace AzToolsFramework
         RefreshUiAfterChange(manipulatorEntityIds.m_entityIds);
     }
 
-    void EditorTransformComponentSelection::CopyOrientationToSelectedEntitiesIndividual(
-        const AZ::Quaternion& orientation)
+    void EditorTransformComponentSelection::CopyOrientationToSelectedEntitiesIndividual(const AZ::Quaternion& orientation)
     {
         AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
 
         if (m_entityIdManipulators.m_manipulators)
         {
-            ScopedUndoBatch undoBatch { s_dittoEntityOrientationIndividualUndoRedoDesc };
+            ScopedUndoBatch undoBatch{ s_dittoEntityOrientationIndividualUndoRedoDesc };
 
-            auto manipulatorCommand = AZStd::make_unique<EntityManipulatorCommand>(
-                CreateManipulatorCommandStateFromSelf(), s_manipulatorUndoRedoName);
+            auto manipulatorCommand =
+                AZStd::make_unique<EntityManipulatorCommand>(CreateManipulatorCommandStateFromSelf(), s_manipulatorUndoRedoName);
 
             ManipulatorEntityIds manipulatorEntityIds;
             BuildSortedEntityIdVectorFromEntityIdMap(m_entityIdManipulators.m_lookups, manipulatorEntityIds.m_entityIds);
@@ -3127,8 +3001,7 @@ namespace AzToolsFramework
         }
     }
 
-    void EditorTransformComponentSelection::CopyOrientationToSelectedEntitiesGroup(
-        const AZ::Quaternion& orientation)
+    void EditorTransformComponentSelection::CopyOrientationToSelectedEntitiesGroup(const AZ::Quaternion& orientation)
     {
         AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
 
@@ -3136,8 +3009,8 @@ namespace AzToolsFramework
         {
             ScopedUndoBatch undoBatch(s_dittoEntityOrientationGroupUndoRedoDesc);
 
-            auto manipulatorCommand = AZStd::make_unique<EntityManipulatorCommand>(
-                CreateManipulatorCommandStateFromSelf(), s_manipulatorUndoRedoName);
+            auto manipulatorCommand =
+                AZStd::make_unique<EntityManipulatorCommand>(CreateManipulatorCommandStateFromSelf(), s_manipulatorUndoRedoName);
 
             ManipulatorEntityIds manipulatorEntityIds;
             BuildSortedEntityIdVectorFromEntityIdMap(m_entityIdManipulators.m_lookups, manipulatorEntityIds.m_entityIds);
@@ -3145,8 +3018,7 @@ namespace AzToolsFramework
             // save initial transforms
             const auto transformsBefore = RecordTransformsBefore(manipulatorEntityIds.m_entityIds);
 
-            const AZ::Transform currentTransform =
-                m_entityIdManipulators.m_manipulators->GetLocalTransform();
+            const AZ::Transform currentTransform = m_entityIdManipulators.m_manipulators->GetLocalTransform();
             const AZ::Transform nextTransform = AZ::Transform::CreateFromQuaternionAndTranslation(
                 orientation, m_entityIdManipulators.m_manipulators->GetLocalTransform().GetTranslation());
 
@@ -3160,8 +3032,7 @@ namespace AzToolsFramework
                 const auto transformIt = transformsBefore.find(entityId);
                 if (transformIt != transformsBefore.end())
                 {
-                    const AZ::Transform transformInPivotSpace =
-                        currentTransform.GetInverse() * transformIt->second;
+                    const AZ::Transform transformInPivotSpace = currentTransform.GetInverse() * transformIt->second;
 
                     SetEntityWorldTransform(entityId, nextTransform * transformInPivotSpace);
                 }
@@ -3183,7 +3054,7 @@ namespace AzToolsFramework
         AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
 
         ScopedUndoBatch undoBatch(s_resetOrientationToParentUndoRedoDesc);
-        for (const auto& entityIdLookup: m_entityIdManipulators.m_lookups)
+        for (const auto& entityIdLookup : m_entityIdManipulators.m_lookups)
         {
             ScopedUndoBatch::MarkEntityDirty(entityIdLookup.first);
             SetEntityLocalRotation(entityIdLookup.first, AZ::Vector3::CreateZero());
@@ -3206,14 +3077,12 @@ namespace AzToolsFramework
             ScopedUndoBatch undoBatch(s_resetTranslationToParentUndoRedoDesc);
 
             ManipulatorEntityIds manipulatorEntityIds;
-            BuildSortedEntityIdVectorFromEntityIdMap(
-                m_entityIdManipulators.m_lookups, manipulatorEntityIds.m_entityIds);
+            BuildSortedEntityIdVectorFromEntityIdMap(m_entityIdManipulators.m_lookups, manipulatorEntityIds.m_entityIds);
 
             for (AZ::EntityId entityId : manipulatorEntityIds.m_entityIds)
             {
                 AZ::EntityId parentId;
-                AZ::TransformBus::EventResult(
-                    parentId, entityId, &AZ::TransformBus::Events::GetParentId);
+                AZ::TransformBus::EventResult(parentId, entityId, &AZ::TransformBus::Events::GetParentId);
 
                 if (parentId.IsValid())
                 {
@@ -3228,11 +3097,15 @@ namespace AzToolsFramework
         }
     }
 
-    void EditorTransformComponentSelection::PopulateEditorGlobalContextMenu(
-        QMenu* menu, const AZ::Vector2& /*point*/, const int /*flags*/)
+    void EditorTransformComponentSelection::PopulateEditorGlobalContextMenu(QMenu* menu, const AZ::Vector2& /*point*/, const int /*flags*/)
     {
         QAction* action = menu->addAction(QObject::tr(s_togglePivotTitleRightClick));
-        QObject::connect(action, &QAction::triggered, action, [this]() { ToggleCenterPivotSelection(); });
+        QObject::connect(
+            action, &QAction::triggered, action,
+            [this]()
+            {
+                ToggleCenterPivotSelection();
+            });
     }
 
     void EditorTransformComponentSelection::BeforeEntitySelectionChanged()
@@ -3278,8 +3151,10 @@ namespace AzToolsFramework
     }
 
     static void DrawPreviewAxis(
-        AzFramework::DebugDisplayRequests& display, const AZ::Transform& transform,
-        const float axisLength, const AzFramework::CameraState& cameraState)
+        AzFramework::DebugDisplayRequests& display,
+        const AZ::Transform& transform,
+        const float axisLength,
+        const AzFramework::CameraState& cameraState)
     {
         AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
 
@@ -3294,8 +3169,8 @@ namespace AzToolsFramework
         const auto axisFlip = [&transform, &cameraState](const AZ::Vector3& axis) -> float
         {
             return ShouldFlipCameraAxis(
-                AZ::Transform::CreateIdentity(), transform.GetTranslation(),
-                TransformDirectionNoScaling(transform, axis), cameraState)
+                       AZ::Transform::CreateIdentity(), transform.GetTranslation(), TransformDirectionNoScaling(transform, axis),
+                       cameraState)
                 ? -1.0f
                 : 1.0f;
         };
@@ -3303,18 +3178,15 @@ namespace AzToolsFramework
         display.SetColor(s_fadedXAxisColor);
         display.DrawLine(
             transform.GetTranslation(),
-            transform.GetTranslation() + transform.GetBasisX().GetNormalizedSafe() *
-            axisLength * axisFlip(AZ::Vector3::CreateAxisX()));
+            transform.GetTranslation() + transform.GetBasisX().GetNormalizedSafe() * axisLength * axisFlip(AZ::Vector3::CreateAxisX()));
         display.SetColor(s_fadedYAxisColor);
         display.DrawLine(
             transform.GetTranslation(),
-            transform.GetTranslation() + transform.GetBasisY().GetNormalizedSafe() *
-            axisLength * axisFlip(AZ::Vector3::CreateAxisY()));
+            transform.GetTranslation() + transform.GetBasisY().GetNormalizedSafe() * axisLength * axisFlip(AZ::Vector3::CreateAxisY()));
         display.SetColor(s_fadedZAxisColor);
         display.DrawLine(
             transform.GetTranslation(),
-            transform.GetTranslation() + transform.GetBasisZ().GetNormalizedSafe() *
-            axisLength * axisFlip(AZ::Vector3::CreateAxisZ()));
+            transform.GetTranslation() + transform.GetBasisZ().GetNormalizedSafe() * axisLength * axisFlip(AZ::Vector3::CreateAxisZ()));
 
         display.DepthWriteOn();
         display.DepthTestOn();
@@ -3327,15 +3199,11 @@ namespace AzToolsFramework
     static void DrawManipulatorGrid(
         AzFramework::DebugDisplayRequests& debugDisplay, const EntityIdManipulators& entityIdManipulators, const float gridSize)
     {
-        const AZ::Matrix3x3 orientation =
-            AZ::Matrix3x3::CreateFromTransform(entityIdManipulators.m_manipulators->GetLocalTransform());
+        const AZ::Matrix3x3 orientation = AZ::Matrix3x3::CreateFromTransform(entityIdManipulators.m_manipulators->GetLocalTransform());
 
-        const AZ::Vector3 translation =
-            entityIdManipulators.m_manipulators->GetLocalTransform().GetTranslation();
+        const AZ::Vector3 translation = entityIdManipulators.m_manipulators->GetLocalTransform().GetTranslation();
 
-        DrawSnappingGrid(
-            debugDisplay, AZ::Transform::CreateFromMatrix3x3AndTranslation(orientation, translation),
-            gridSize);
+        DrawSnappingGrid(debugDisplay, AZ::Transform::CreateFromMatrix3x3AndTranslation(orientation, translation), gridSize);
     }
 
     void EditorTransformComponentSelection::DisplayViewportSelection(
@@ -3345,16 +3213,14 @@ namespace AzToolsFramework
 
         CheckDirtyEntityIds();
 
-        const auto modifiers = ViewportInteraction::KeyboardModifiers(
-            ViewportInteraction::TranslateKeyboardModifiers(QApplication::queryKeyboardModifiers()));
+        const auto modifiers =
+            ViewportInteraction::KeyboardModifiers(ViewportInteraction::TranslateKeyboardModifiers(QApplication::queryKeyboardModifiers()));
 
         m_cursorState.Update();
 
         HandleAccents(
-            !m_selectedEntityIds.empty(), m_cachedEntityIdUnderCursor,
-            modifiers.Ctrl(), m_hoveredEntityId,
-            ViewportInteraction::BuildMouseButtons(
-                QGuiApplication::mouseButtons()), m_boxSelect.Active());
+            !m_selectedEntityIds.empty(), m_cachedEntityIdUnderCursor, modifiers.Ctrl(), m_hoveredEntityId,
+            ViewportInteraction::BuildMouseButtons(QGuiApplication::mouseButtons()), m_boxSelect.Active());
 
         const ReferenceFrame referenceFrame = m_spaceCluster.m_spaceLock.value_or(ReferenceFrameFromModifiers(modifiers));
 
@@ -3367,10 +3233,8 @@ namespace AzToolsFramework
             refresh = true;
         }
 
-        refresh = refresh
-            ||  (m_triedToRefresh
-                && m_entityIdManipulators.m_manipulators
-                && !m_entityIdManipulators.m_manipulators->PerformingAction());
+        refresh = refresh ||
+            (m_triedToRefresh && m_entityIdManipulators.m_manipulators && !m_entityIdManipulators.m_manipulators->PerformingAction());
 
         // we've moved from parent to world space, parent to local space or vice versa by holding or
         // releasing shift and/or alt - make sure we update the manipulator orientation appropriately
@@ -3383,8 +3247,7 @@ namespace AzToolsFramework
 
         const auto entityFilter = [this](AZ::EntityId entityId)
         {
-            const bool entityHasManipulator =
-                m_entityIdManipulators.m_lookups.find(entityId) != m_entityIdManipulators.m_lookups.end();
+            const bool entityHasManipulator = m_entityIdManipulators.m_lookups.find(entityId) != m_entityIdManipulators.m_lookups.end();
 
             return !entityHasManipulator;
         };
@@ -3395,15 +3258,12 @@ namespace AzToolsFramework
         {
             if (m_pivotOverrideFrame.m_pickedEntityIdOverride.IsValid())
             {
-                const AZ::Transform pickedEntityWorldTransform =
-                    AZ::Transform::CreateFromQuaternionAndTranslation(
-                        ETCS::CalculatePivotOrientation(
-                            m_pivotOverrideFrame.m_pickedEntityIdOverride, referenceFrame).m_worldOrientation,
-                        CalculatePivotTranslation(
-                            m_pivotOverrideFrame.m_pickedEntityIdOverride, m_pivotMode));
+                const AZ::Transform pickedEntityWorldTransform = AZ::Transform::CreateFromQuaternionAndTranslation(
+                    ETCS::CalculatePivotOrientation(m_pivotOverrideFrame.m_pickedEntityIdOverride, referenceFrame).m_worldOrientation,
+                    CalculatePivotTranslation(m_pivotOverrideFrame.m_pickedEntityIdOverride, m_pivotMode));
 
-                const float scaledSize = s_pivotSize *
-                    CalculateScreenToWorldMultiplier(pickedEntityWorldTransform.GetTranslation(), cameraState);
+                const float scaledSize =
+                    s_pivotSize * CalculateScreenToWorldMultiplier(pickedEntityWorldTransform.GetTranslation(), cameraState);
 
                 debugDisplay.DepthWriteOff();
                 debugDisplay.DepthTestOff();
@@ -3418,8 +3278,8 @@ namespace AzToolsFramework
             // check what pivot orientation we are in (based on if a modifier is
             // held to move us from parent to world space or parent to local space)
             // or if we set a pivot override
-            const auto pivotResult = ETCS::CalculateSelectionPivotOrientation(
-                m_entityIdManipulators.m_lookups, m_pivotOverrideFrame, m_referenceFrame);
+            const auto pivotResult =
+                ETCS::CalculateSelectionPivotOrientation(m_entityIdManipulators.m_lookups, m_pivotOverrideFrame, m_referenceFrame);
 
             // if the reference frame was parent space and the selection does have a
             // valid parent, draw a preview axis at its position/orientation
@@ -3429,8 +3289,7 @@ namespace AzToolsFramework
                 {
                     const AZ::Transform& worldFromLocal = m_entityDataCache->GetVisibleEntityTransform(*parentEntityIndex);
 
-                    const float adjustedLineLength =
-                        CalculateScreenToWorldMultiplier(worldFromLocal.GetTranslation(), cameraState);
+                    const float adjustedLineLength = CalculateScreenToWorldMultiplier(worldFromLocal.GetTranslation(), cameraState);
 
                     DrawPreviewAxis(debugDisplay, worldFromLocal, adjustedLineLength, cameraState);
                 }
@@ -3449,10 +3308,11 @@ namespace AzToolsFramework
 
                     const AZ::Vector3 boxPosition = worldFromLocal.TransformPoint(CalculateCenterOffset(entityId, m_pivotMode));
 
-                    const AZ::Vector3 scaledSize = AZ::Vector3(s_pivotSize) *
-                        CalculateScreenToWorldMultiplier(worldFromLocal.GetTranslation(), cameraState);
+                    const AZ::Vector3 scaledSize =
+                        AZ::Vector3(s_pivotSize) * CalculateScreenToWorldMultiplier(worldFromLocal.GetTranslation(), cameraState);
 
-                    const AZ::Color hiddenNormal[] = { AzFramework::ViewportColors::SelectedColor, AzFramework::ViewportColors::HiddenColor };
+                    const AZ::Color hiddenNormal[] = { AzFramework::ViewportColors::SelectedColor,
+                                                       AzFramework::ViewportColors::HiddenColor };
                     AZ::Color boxColor = hiddenNormal[hidden];
                     const AZ::Color lockedOther[] = { boxColor, AzFramework::ViewportColors::LockColor };
                     boxColor = lockedOther[locked];
@@ -3467,8 +3327,7 @@ namespace AzToolsFramework
             debugDisplay.DepthWriteOn();
             debugDisplay.DepthTestOn();
 
-            if (ShowingGrid(viewportInfo.m_viewportId) && m_mode == Mode::Translation &&
-                !ComponentModeFramework::InComponentMode())
+            if (ShowingGrid(viewportInfo.m_viewportId) && m_mode == Mode::Translation && !ComponentModeFramework::InComponentMode())
             {
                 const GridSnapParameters gridSnapParams = GridSnapSettings(viewportInfo.m_viewportId);
                 if (gridSnapParams.m_gridSnap && m_entityIdManipulators.m_manipulators)
@@ -3488,11 +3347,11 @@ namespace AzToolsFramework
 
             if (m_entityIdManipulators.m_manipulators->PerformingAction())
             {
-                const float adjustedLineLength = 2.0f *
-                    CalculateScreenToWorldMultiplier(m_axisPreview.m_translation, cameraState);
+                const float adjustedLineLength = 2.0f * CalculateScreenToWorldMultiplier(m_axisPreview.m_translation, cameraState);
 
-                DrawPreviewAxis(debugDisplay, AZ::Transform::CreateFromQuaternionAndTranslation(
-                    m_axisPreview.m_orientation, m_axisPreview.m_translation),
+                DrawPreviewAxis(
+                    debugDisplay,
+                    AZ::Transform::CreateFromQuaternionAndTranslation(m_axisPreview.m_orientation, m_axisPreview.m_translation),
                     adjustedLineLength, cameraState);
             }
         }
@@ -3500,20 +3359,17 @@ namespace AzToolsFramework
         m_boxSelect.DisplayScene(viewportInfo, debugDisplay);
     }
 
-    static void DrawAxisGizmo(
-        const AzFramework::ViewportInfo& viewportInfo, AzFramework::DebugDisplayRequests& debugDisplay)
+    static void DrawAxisGizmo(const AzFramework::ViewportInfo& viewportInfo, AzFramework::DebugDisplayRequests& debugDisplay)
     {
         // get the editor cameras current orientation
         const int viewportId = viewportInfo.m_viewportId;
         const AzFramework::CameraState editorCameraState = GetCameraState(viewportId);
-        const AZ::Matrix3x3& editorCameraOrientation =
-            AZ::Matrix3x3::CreateFromMatrix4x4(AzFramework::CameraTransform(editorCameraState));
+        const AZ::Matrix3x3& editorCameraOrientation = AZ::Matrix3x3::CreateFromMatrix4x4(AzFramework::CameraTransform(editorCameraState));
 
         // create a gizmo camera transform about the origin matching the orientation of the editor camera
         // (10 units back in the y axis to produce an orbit effect)
         const AZ::Transform gizmoCameraOffset = AZ::Transform::CreateTranslation(AZ::Vector3::CreateAxisY(10.0f));
-        const AZ::Transform gizmoCameraTransform =
-            AZ::Transform::CreateFromMatrix3x3(editorCameraOrientation) * gizmoCameraOffset;
+        const AZ::Transform gizmoCameraTransform = AZ::Transform::CreateFromMatrix3x3(editorCameraOrientation) * gizmoCameraOffset;
         const AzFramework::CameraState gizmoCameraState =
             AzFramework::CreateDefaultCamera(gizmoCameraTransform, editorCameraState.m_viewportSize);
 
@@ -3526,16 +3382,9 @@ namespace AzToolsFramework
 
         // map from a position in world space (relative to the the gizmo camera near the origin) to a position in
         // screen space
-        const auto calculateGizmoAxis =
-            [&cameraView, &cameraProjection, &screenOffset]
-            (const AZ::Vector3& axis)
+        const auto calculateGizmoAxis = [&cameraView, &cameraProjection, &screenOffset](const AZ::Vector3& axis)
         {
-            auto result = AZ::Vector2(
-                AzFramework::WorldToScreenNDC(
-                    axis,
-                    cameraView,
-                    cameraProjection)
-            );
+            auto result = AZ::Vector2(AzFramework::WorldToScreenNDC(axis, cameraView, cameraProjection));
             result.SetY(1.0f - result.GetY());
             return result + screenOffset;
         };
@@ -3549,7 +3398,7 @@ namespace AzToolsFramework
 
         const AZ::Vector2 gizmoAxisX = gizmoEndAxisX - gizmoStart;
         const AZ::Vector2 gizmoAxisY = gizmoEndAxisY - gizmoStart;
-        const AZ::Vector2 gizmoAxisZ = gizmoEndAxisZ - gizmoStart;                                          
+        const AZ::Vector2 gizmoAxisZ = gizmoEndAxisZ - gizmoStart;
 
         // draw the axes of the gizmo
         debugDisplay.SetLineWidth(cl_viewportGizmoAxisLineWidth);
@@ -3576,8 +3425,7 @@ namespace AzToolsFramework
     }
 
     void EditorTransformComponentSelection::DisplayViewportSelection2d(
-        const AzFramework::ViewportInfo& viewportInfo,
-        AzFramework::DebugDisplayRequests& debugDisplay)
+        const AzFramework::ViewportInfo& viewportInfo, AzFramework::DebugDisplayRequests& debugDisplay)
     {
         AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
 
@@ -3592,8 +3440,7 @@ namespace AzToolsFramework
 
         // check what the 'authoritative' selected entity ids are after an undo/redo
         EntityIdList selectedEntityIds;
-        ToolsApplicationRequests::Bus::BroadcastResult(
-            selectedEntityIds, &ToolsApplicationRequests::GetSelectedEntities);
+        ToolsApplicationRequests::Bus::BroadcastResult(selectedEntityIds, &ToolsApplicationRequests::GetSelectedEntities);
 
         RefreshSelectedEntityIds(selectedEntityIds);
     }
@@ -3611,9 +3458,7 @@ namespace AzToolsFramework
         // update selected entityId set
         m_selectedEntityIds.clear();
         m_selectedEntityIds.reserve(selectedEntityIds.size());
-        AZStd::copy(
-            selectedEntityIds.begin(), selectedEntityIds.end(),
-            AZStd::inserter(m_selectedEntityIds, m_selectedEntityIds.end()));
+        AZStd::copy(selectedEntityIds.begin(), selectedEntityIds.end(), AZStd::inserter(m_selectedEntityIds, m_selectedEntityIds.end()));
     }
 
     void EditorTransformComponentSelection::OnTransformChanged(
@@ -3687,8 +3532,7 @@ namespace AzToolsFramework
         m_selectedEntityIdsAndManipulatorsDirty = true;
     }
 
-    void EditorTransformComponentSelection::EnteredComponentMode(
-        const AZStd::vector<AZ::Uuid>& /*componentModeTypes*/)
+    void EditorTransformComponentSelection::EnteredComponentMode(const AZStd::vector<AZ::Uuid>& /*componentModeTypes*/)
     {
         SetViewportUiClusterVisible(m_transformModeClusterId, false);
 
@@ -3697,8 +3541,7 @@ namespace AzToolsFramework
         ToolsApplicationNotificationBus::Handler::BusDisconnect();
     }
 
-    void EditorTransformComponentSelection::LeftComponentMode(
-        const AZStd::vector<AZ::Uuid>& /*componentModeTypes*/)
+    void EditorTransformComponentSelection::LeftComponentMode(const AZStd::vector<AZ::Uuid>& /*componentModeTypes*/)
     {
         SetViewportUiClusterVisible(m_transformModeClusterId, true);
 
@@ -3711,8 +3554,8 @@ namespace AzToolsFramework
     {
         if (m_entityIdManipulators.m_manipulators)
         {
-            auto manipulatorCommand = AZStd::make_unique<EntityManipulatorCommand>(
-                CreateManipulatorCommandStateFromSelf(), s_manipulatorUndoRedoName);
+            auto manipulatorCommand =
+                AZStd::make_unique<EntityManipulatorCommand>(CreateManipulatorCommandStateFromSelf(), s_manipulatorUndoRedoName);
 
             manipulatorCommand->SetManipulatorAfter(EntityManipulatorCommand::State());
 
@@ -3731,32 +3574,27 @@ namespace AzToolsFramework
         return {};
     }
 
-    void EditorTransformComponentSelection::SetEntityWorldTranslation(
-        const AZ::EntityId entityId, const AZ::Vector3& worldTranslation)
+    void EditorTransformComponentSelection::SetEntityWorldTranslation(const AZ::EntityId entityId, const AZ::Vector3& worldTranslation)
     {
         ETCS::SetEntityWorldTranslation(entityId, worldTranslation, m_transformChangedInternally);
     }
 
-    void EditorTransformComponentSelection::SetEntityLocalTranslation(
-        const AZ::EntityId entityId, const AZ::Vector3& localTranslation)
+    void EditorTransformComponentSelection::SetEntityLocalTranslation(const AZ::EntityId entityId, const AZ::Vector3& localTranslation)
     {
         ETCS::SetEntityLocalTranslation(entityId, localTranslation, m_transformChangedInternally);
     }
 
-    void EditorTransformComponentSelection::SetEntityWorldTransform(
-        const AZ::EntityId entityId, const AZ::Transform& worldTransform)
+    void EditorTransformComponentSelection::SetEntityWorldTransform(const AZ::EntityId entityId, const AZ::Transform& worldTransform)
     {
         ETCS::SetEntityWorldTransform(entityId, worldTransform, m_transformChangedInternally);
     }
 
-    void EditorTransformComponentSelection::SetEntityLocalScale(
-        const AZ::EntityId entityId, const float localScale)
+    void EditorTransformComponentSelection::SetEntityLocalScale(const AZ::EntityId entityId, const float localScale)
     {
         ETCS::SetEntityLocalScale(entityId, localScale, m_transformChangedInternally);
     }
 
-    void EditorTransformComponentSelection::SetEntityLocalRotation(
-        const AZ::EntityId entityId, const AZ::Vector3& localRotation)
+    void EditorTransformComponentSelection::SetEntityLocalRotation(const AZ::EntityId entityId, const AZ::Vector3& localRotation)
     {
         ETCS::SetEntityLocalRotation(entityId, localRotation, m_transformChangedInternally);
     }
@@ -3785,44 +3623,37 @@ namespace AzToolsFramework
         void SetEntityWorldTranslation(AZ::EntityId entityId, const AZ::Vector3& worldTranslation, bool& internal)
         {
             ScopeSwitch sw(internal);
-            AZ::TransformBus::Event(
-                entityId, &AZ::TransformBus::Events::SetWorldTranslation, worldTranslation);
+            AZ::TransformBus::Event(entityId, &AZ::TransformBus::Events::SetWorldTranslation, worldTranslation);
         }
 
         void SetEntityLocalTranslation(AZ::EntityId entityId, const AZ::Vector3& localTranslation, bool& internal)
         {
             ScopeSwitch sw(internal);
-            AZ::TransformBus::Event(
-                entityId, &AZ::TransformBus::Events::SetLocalTranslation, localTranslation);
+            AZ::TransformBus::Event(entityId, &AZ::TransformBus::Events::SetLocalTranslation, localTranslation);
         }
 
         void SetEntityWorldTransform(AZ::EntityId entityId, const AZ::Transform& worldTransform, bool& internal)
         {
             ScopeSwitch sw(internal);
-            AZ::TransformBus::Event(
-                entityId, &AZ::TransformBus::Events::SetWorldTM, worldTransform);
+            AZ::TransformBus::Event(entityId, &AZ::TransformBus::Events::SetWorldTM, worldTransform);
         }
 
         void SetEntityLocalScale(AZ::EntityId entityId, float localScale, bool& internal)
         {
             ScopeSwitch sw(internal);
-            AZ::TransformBus::Event(
-                entityId, &AZ::TransformBus::Events::SetLocalUniformScale, localScale);
+            AZ::TransformBus::Event(entityId, &AZ::TransformBus::Events::SetLocalUniformScale, localScale);
         }
 
         void SetEntityLocalRotation(AZ::EntityId entityId, const AZ::Vector3& localRotation, bool& internal)
         {
             ScopeSwitch sw(internal);
-            AZ::TransformBus::Event(
-                entityId, &AZ::TransformBus::Events::SetLocalRotation, localRotation);
+            AZ::TransformBus::Event(entityId, &AZ::TransformBus::Events::SetLocalRotation, localRotation);
         }
     } // namespace ETCS
 
     // explicit instantiations
-    template ETCS::PivotOrientationResult
-        ETCS::CalculatePivotOrientationForEntityIds<EntityIdManipulatorLookups>(
-            const EntityIdManipulatorLookups&, ReferenceFrame);
-    template ETCS::PivotOrientationResult
-        ETCS::CalculateSelectionPivotOrientation<EntityIdManipulatorLookups>(
-            const EntityIdManipulatorLookups&, const OptionalFrame&, const ReferenceFrame referenceFrame);
+    template ETCS::PivotOrientationResult ETCS::CalculatePivotOrientationForEntityIds<EntityIdManipulatorLookups>(
+        const EntityIdManipulatorLookups&, ReferenceFrame);
+    template ETCS::PivotOrientationResult ETCS::CalculateSelectionPivotOrientation<EntityIdManipulatorLookups>(
+        const EntityIdManipulatorLookups&, const OptionalFrame&, const ReferenceFrame referenceFrame);
 } // namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelectionRequestBus.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelectionRequestBus.cpp
index 9ca20068ed..8cd19b8d2d 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelectionRequestBus.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelectionRequestBus.cpp
@@ -1,17 +1,17 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
-#include <AzCore/RTTI/BehaviorContext.h>
 #include "EditorTransformComponentSelectionRequestBus.h"
+#include <AzCore/RTTI/BehaviorContext.h>
 
 namespace AzToolsFramework
 {
@@ -19,50 +19,68 @@ namespace AzToolsFramework
     {
         if (AZ::BehaviorContext* behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context))
         {
-            #define TEMP_SET_ATTRIBUTES_FOR_EditorTransformComponentSelectionRequests() \
-                ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Common) \
-                ->Attribute(AZ::Script::Attributes::Category, "Editor") \
-                ->Attribute(AZ::Script::Attributes::Module, "editor")                              
+#define TEMP_SET_ATTRIBUTES_FOR_EditorTransformComponentSelectionRequests()                                                                \
+    ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Common)                                                 \
+        ->Attribute(AZ::Script::Attributes::Category, "Editor")                                                                            \
+        ->Attribute(AZ::Script::Attributes::Module, "editor")
 
-            behaviorContext->EnumProperty<static_cast<int>(EditorTransformComponentSelectionRequests::Mode::Rotation)>("TransformMode_Rotation")
-                TEMP_SET_ATTRIBUTES_FOR_EditorTransformComponentSelectionRequests();
-            behaviorContext->EnumProperty<static_cast<int>(EditorTransformComponentSelectionRequests::Mode::Translation)>("TransformMode_Translation")
-                TEMP_SET_ATTRIBUTES_FOR_EditorTransformComponentSelectionRequests();
+            behaviorContext->EnumProperty<static_cast<int>(EditorTransformComponentSelectionRequests::Mode::Rotation)>(
+                "TransformMode_Rotation") TEMP_SET_ATTRIBUTES_FOR_EditorTransformComponentSelectionRequests();
+            behaviorContext->EnumProperty<static_cast<int>(EditorTransformComponentSelectionRequests::Mode::Translation)>(
+                "TransformMode_Translation") TEMP_SET_ATTRIBUTES_FOR_EditorTransformComponentSelectionRequests();
             behaviorContext->EnumProperty<static_cast<int>(EditorTransformComponentSelectionRequests::Mode::Scale)>("TransformMode_Scale")
                 TEMP_SET_ATTRIBUTES_FOR_EditorTransformComponentSelectionRequests();
 
-            behaviorContext->EnumProperty<static_cast<int>(EditorTransformComponentSelectionRequests::RefreshType::Translation)>("TransformRefreshType_Translation")
-                TEMP_SET_ATTRIBUTES_FOR_EditorTransformComponentSelectionRequests();
-            behaviorContext->EnumProperty<static_cast<int>(EditorTransformComponentSelectionRequests::RefreshType::Orientation)>("TransformRefreshType_Orientation")
-                TEMP_SET_ATTRIBUTES_FOR_EditorTransformComponentSelectionRequests();
-            behaviorContext->EnumProperty<static_cast<int>(EditorTransformComponentSelectionRequests::RefreshType::All)>("TransformRefreshType_All")
-                TEMP_SET_ATTRIBUTES_FOR_EditorTransformComponentSelectionRequests();
+            behaviorContext->EnumProperty<static_cast<int>(EditorTransformComponentSelectionRequests::RefreshType::Translation)>(
+                "TransformRefreshType_Translation") TEMP_SET_ATTRIBUTES_FOR_EditorTransformComponentSelectionRequests();
+            behaviorContext->EnumProperty<static_cast<int>(EditorTransformComponentSelectionRequests::RefreshType::Orientation)>(
+                "TransformRefreshType_Orientation") TEMP_SET_ATTRIBUTES_FOR_EditorTransformComponentSelectionRequests();
+            behaviorContext->EnumProperty<static_cast<int>(EditorTransformComponentSelectionRequests::RefreshType::All)>(
+                "TransformRefreshType_All") TEMP_SET_ATTRIBUTES_FOR_EditorTransformComponentSelectionRequests();
 
-            behaviorContext->EnumProperty<static_cast<int>(EditorTransformComponentSelectionRequests::Pivot::Object)>("TransformPivot_Object")
-                TEMP_SET_ATTRIBUTES_FOR_EditorTransformComponentSelectionRequests();
-            behaviorContext->EnumProperty<static_cast<int>(EditorTransformComponentSelectionRequests::Pivot::Center)>("TransformPivot_Center")
-                TEMP_SET_ATTRIBUTES_FOR_EditorTransformComponentSelectionRequests();
+            behaviorContext->EnumProperty<static_cast<int>(EditorTransformComponentSelectionRequests::Pivot::Object)>(
+                "TransformPivot_Object") TEMP_SET_ATTRIBUTES_FOR_EditorTransformComponentSelectionRequests();
+            behaviorContext->EnumProperty<static_cast<int>(EditorTransformComponentSelectionRequests::Pivot::Center)>(
+                "TransformPivot_Center") TEMP_SET_ATTRIBUTES_FOR_EditorTransformComponentSelectionRequests();
 
-            behaviorContext->EBus<EditorTransformComponentSelectionRequestBus>("EditorTransformComponentSelectionRequestBus")
-                TEMP_SET_ATTRIBUTES_FOR_EditorTransformComponentSelectionRequests()
+            behaviorContext
+                ->EBus<EditorTransformComponentSelectionRequestBus>("EditorTransformComponentSelectionRequestBus")
+                    TEMP_SET_ATTRIBUTES_FOR_EditorTransformComponentSelectionRequests()
                 ->Event("SetTransformMode", &EditorTransformComponentSelectionRequestBus::Events::SetTransformMode)
                 ->Event("GetTransformMode", &EditorTransformComponentSelectionRequestBus::Events::GetTransformMode)
                 // Reflecting GetManipulatorTransform will require hash<AZ::Transform> to be implemented, a pending task.
                 //->Event("GetManipulatorTransform", &EditorTransformComponentSelectionRequestBus::Events::GetManipulatorTransform)
                 ->Event("RefreshManipulators", &EditorTransformComponentSelectionRequestBus::Events::RefreshManipulators)
-                ->Event("OverrideManipulatorOrientation", &EditorTransformComponentSelectionRequestBus::Events::OverrideManipulatorOrientation)
-                ->Event("OverrideManipulatorTranslation", &EditorTransformComponentSelectionRequestBus::Events::OverrideManipulatorTranslation)
-                ->Event("CopyTranslationToSelectedEntitiesIndividual", &EditorTransformComponentSelectionRequestBus::Events::CopyTranslationToSelectedEntitiesIndividual)
-                ->Event("CopyTranslationToSelectedEntitiesGroup", &EditorTransformComponentSelectionRequestBus::Events::CopyTranslationToSelectedEntitiesGroup)
-                ->Event("ResetTranslationForSelectedEntitiesLocal", &EditorTransformComponentSelectionRequestBus::Events::ResetTranslationForSelectedEntitiesLocal)
-                ->Event("CopyOrientationToSelectedEntitiesIndividual", &EditorTransformComponentSelectionRequestBus::Events::CopyOrientationToSelectedEntitiesIndividual)
-                ->Event("CopyOrientationToSelectedEntitiesGroup", &EditorTransformComponentSelectionRequestBus::Events::CopyOrientationToSelectedEntitiesGroup)
-                ->Event("ResetOrientationForSelectedEntitiesLocal", &EditorTransformComponentSelectionRequestBus::Events::ResetOrientationForSelectedEntitiesLocal)
-                ->Event("CopyScaleToSelectedEntitiesIndividualLocal", &EditorTransformComponentSelectionRequestBus::Events::CopyScaleToSelectedEntitiesIndividualLocal)
-                ->Event("CopyScaleToSelectedEntitiesIndividualWorld", &EditorTransformComponentSelectionRequestBus::Events::CopyScaleToSelectedEntitiesIndividualWorld)
-                ;
+                ->Event(
+                    "OverrideManipulatorOrientation", &EditorTransformComponentSelectionRequestBus::Events::OverrideManipulatorOrientation)
+                ->Event(
+                    "OverrideManipulatorTranslation", &EditorTransformComponentSelectionRequestBus::Events::OverrideManipulatorTranslation)
+                ->Event(
+                    "CopyTranslationToSelectedEntitiesIndividual",
+                    &EditorTransformComponentSelectionRequestBus::Events::CopyTranslationToSelectedEntitiesIndividual)
+                ->Event(
+                    "CopyTranslationToSelectedEntitiesGroup",
+                    &EditorTransformComponentSelectionRequestBus::Events::CopyTranslationToSelectedEntitiesGroup)
+                ->Event(
+                    "ResetTranslationForSelectedEntitiesLocal",
+                    &EditorTransformComponentSelectionRequestBus::Events::ResetTranslationForSelectedEntitiesLocal)
+                ->Event(
+                    "CopyOrientationToSelectedEntitiesIndividual",
+                    &EditorTransformComponentSelectionRequestBus::Events::CopyOrientationToSelectedEntitiesIndividual)
+                ->Event(
+                    "CopyOrientationToSelectedEntitiesGroup",
+                    &EditorTransformComponentSelectionRequestBus::Events::CopyOrientationToSelectedEntitiesGroup)
+                ->Event(
+                    "ResetOrientationForSelectedEntitiesLocal",
+                    &EditorTransformComponentSelectionRequestBus::Events::ResetOrientationForSelectedEntitiesLocal)
+                ->Event(
+                    "CopyScaleToSelectedEntitiesIndividualLocal",
+                    &EditorTransformComponentSelectionRequestBus::Events::CopyScaleToSelectedEntitiesIndividualLocal)
+                ->Event(
+                    "CopyScaleToSelectedEntitiesIndividualWorld",
+                    &EditorTransformComponentSelectionRequestBus::Events::CopyScaleToSelectedEntitiesIndividualWorld);
 
-            #undef TEMP_SET_ATTRIBUTES_FOR_EditorTransformComponentSelectionRequests
+#undef TEMP_SET_ATTRIBUTES_FOR_EditorTransformComponentSelectionRequests
         }
     }
 } // namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelectionRequestBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelectionRequestBus.h
index 9cd78f8c50..966f9333fc 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelectionRequestBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelectionRequestBus.h
@@ -1,14 +1,14 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
 #pragma once
 
@@ -16,12 +16,10 @@
 #include <AzCore/Math/Transform.h>
 #include <AzFramework/Entity/EntityContextBus.h>
 
-
 namespace AzToolsFramework
 {
-    /// Provide interface for EditorTransformComponentSelection requests.
-    class EditorTransformComponentSelectionRequests
-        : public AZ::EBusTraits
+    //! Provide interface for EditorTransformComponentSelection requests.
+    class EditorTransformComponentSelectionRequests : public AZ::EBusTraits
     {
     public:
         using BusIdType = AzFramework::EntityContextId;
@@ -30,7 +28,7 @@ namespace AzToolsFramework
 
         static void Reflect(AZ::ReflectContext* context);
 
-        /// What type of transform editing are we in.
+        //! What type of transform editing are we in.
         enum class Mode
         {
             // note: ordering of these is important - do not change.
@@ -40,7 +38,7 @@ namespace AzToolsFramework
             Scale
         };
 
-        /// Specify the type of refresh (what type of transform modification caused the refresh).
+        //! Specify the type of refresh (what type of transform modification caused the refresh).
         enum class RefreshType
         {
             Translation,
@@ -48,69 +46,69 @@ namespace AzToolsFramework
             All
         };
 
-        /// How is the pivot aligned (object/authored position or center).
+        //! How is the pivot aligned (object/authored position or center).
         enum class Pivot
         {
             Object,
             Center
         };
 
-        /// Set what kind of transform the type that implements this bus should use.
+        //! Set what kind of transform the type that implements this bus should use.
         virtual void SetTransformMode(Mode mode) = 0;
 
-        /// Return what transform mode the type that implements this bus is using.
+        //! Return what transform mode the type that implements this bus is using.
         virtual Mode GetTransformMode() = 0;
 
-        /// Return the current Entity Manipulator transform.
-        /// An AZStd::optional<AZ::Transform> is returned as if we do not have a selection
-        /// there will be no Manipulator present. In this case we return an empty optional.
+        //! Return the current Entity Manipulator transform.
+        //! An AZStd::optional<AZ::Transform> is returned as if we do not have a selection
+        //! there will be no Manipulator present. In this case we return an empty optional.
         virtual AZStd::optional<AZ::Transform> GetManipulatorTransform() = 0;
 
-        /// Refresh the Manipulator based on the current entity selection.
-        /// This may be useful if the Entity transform has been set outside
-        /// of the EditorTransformComponentSelection and we want to make sure the
-        /// Manipulator stays up to date (in sync) with the current Entity transform.
+        //! Refresh the Manipulator based on the current entity selection.
+        //! This may be useful if the Entity transform has been set outside
+        //! of the EditorTransformComponentSelection and we want to make sure the
+        //! Manipulator stays up to date (in sync) with the current Entity transform.
         virtual void RefreshManipulators(RefreshType refreshType) = 0;
 
-        /// Set an orientation override for the Manipulator.
-        /// Useful if we've picked another Entity transform to use as our reference point.
+        //! Set an orientation override for the Manipulator.
+        //! Useful if we've picked another Entity transform to use as our reference point.
         virtual void OverrideManipulatorOrientation(const AZ::Quaternion& orientation) = 0;
 
-        /// Set a translation override for the Manipulator.
-        /// Useful if we've picked another Entity transform to use as our reference point.
+        //! Set a translation override for the Manipulator.
+        //! Useful if we've picked another Entity transform to use as our reference point.
         virtual void OverrideManipulatorTranslation(const AZ::Vector3& translation) = 0;
 
-        /// Copy translation to each individual entity so they all appear in the exact same position.
+        //! Copy translation to each individual entity so they all appear in the exact same position.
         virtual void CopyTranslationToSelectedEntitiesIndividual(const AZ::Vector3& translation) = 0;
 
-        /// Copy translation to manipulator position with each entity keeping the same relative position as before.
+        //! Copy translation to manipulator position with each entity keeping the same relative position as before.
         virtual void CopyTranslationToSelectedEntitiesGroup(const AZ::Vector3& translation) = 0;
 
-        /// Reset the translation of an entity to the same position as its parent.
-        /// Note: This is a noop if the entity does not have a parent.
+        //! Reset the translation of an entity to the same position as its parent.
+        //! Note: This is a noop if the entity does not have a parent.
         virtual void ResetTranslationForSelectedEntitiesLocal() = 0;
 
-        /// Copy orientation to each individual entity so they all appear in the exact same orientation.
+        //! Copy orientation to each individual entity so they all appear in the exact same orientation.
         virtual void CopyOrientationToSelectedEntitiesIndividual(const AZ::Quaternion& orientation) = 0;
 
-        /// Copy orientation to manipulator with each entity keeping the same relative orientation as before.
+        //! Copy orientation to manipulator with each entity keeping the same relative orientation as before.
         virtual void CopyOrientationToSelectedEntitiesGroup(const AZ::Quaternion& orientation) = 0;
 
-        /// Reset the orientation of an entity to the same orientation as its parent.
-        /// Note: This will be the aligned to the world axes (identity) if the entity does not have a parent.
+        //! Reset the orientation of an entity to the same orientation as its parent.
+        //! Note: This will be the aligned to the world axes (identity) if the entity does not have a parent.
         virtual void ResetOrientationForSelectedEntitiesLocal() = 0;
 
-        /// Copy scale to each individual entity in local space without moving position.
+        //! Copy scale to each individual entity in local space without moving position.
         virtual void CopyScaleToSelectedEntitiesIndividualLocal(float scale) = 0;
 
-        /// Copy scale to to each individual entity in world (absolute) space.
+        //! Copy scale to to each individual entity in world (absolute) space.
         virtual void CopyScaleToSelectedEntitiesIndividualWorld(float scale) = 0;
 
     protected:
         ~EditorTransformComponentSelectionRequests() = default;
     };
 
-    /// Type to inherit to implement EditorTransformComponentSelectionRequests.
+    //! Type to inherit to implement EditorTransformComponentSelectionRequests.
     using EditorTransformComponentSelectionRequestBus = AZ::EBus<EditorTransformComponentSelectionRequests>;
 
 } // namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorVisibleEntityDataCache.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorVisibleEntityDataCache.cpp
index 253c27fe02..0e066684d2 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorVisibleEntityDataCache.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorVisibleEntityDataCache.cpp
@@ -1,33 +1,31 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
 #include "EditorVisibleEntityDataCache.h"
 
 #include <AzCore/std/sort.h>
+#include <AzToolsFramework/Entity/EditorEntityModel.h>
 #include <AzToolsFramework/Viewport/ViewportMessages.h>
 #include <Entity/EditorEntityHelpers.h>
-#include <AzToolsFramework/Entity/EditorEntityModel.h>
 
 namespace AzToolsFramework
 {
-    /// Cached Entity data required by the selection.
+    //! Cached Entity data required by the selection.
     struct EntityData final
     {
         using ComponentEntityAccentType = Components::EditorSelectionAccentSystemComponent::ComponentEntityAccentType;
 
         EntityData() = default;
-        EntityData(
-            AZ::EntityId entityId, const AZ::Transform& worldFromLocal,
-            bool locked, bool visible, bool selected, bool iconHidden);
+        EntityData(AZ::EntityId entityId, const AZ::Transform& worldFromLocal, bool locked, bool visible, bool selected, bool iconHidden);
 
         AZ::Transform m_worldFromLocal;
         AZ::EntityId m_entityId;
@@ -38,7 +36,7 @@ namespace AzToolsFramework
         bool m_iconHidden = false;
     };
 
-    using EntityDatas = AZStd::vector<EntityData>; ///< Alias for vector of EntityDatas.
+    using EntityDatas = AZStd::vector<EntityData>; //!< Alias for vector of EntityDatas.
 
     // Predicate to sort EntityIds with EntityDatas interchangeably.
     struct EntityDataComparer
@@ -52,18 +50,27 @@ namespace AzToolsFramework
     class EditorVisibleEntityDataCache::EditorVisibleEntityDataCacheImpl
     {
     public:
-        EntityIdList m_visibleEntityIds; ///< The EntityIds that are visible this frame.
-        EntityIdList m_prevVisibleEntityIds; ///< The EntityIds that were visible the previous frame (unsorted).
-        EntityDatas m_visibleEntityDatas; ///< Cached EntityData required by EditorTransformComponentSelection.
+        EntityIdList m_visibleEntityIds; //!< The EntityIds that are visible this frame.
+        EntityIdList m_prevVisibleEntityIds; //!< The EntityIds that were visible the previous frame (unsorted).
+        EntityDatas m_visibleEntityDatas; //!< Cached EntityData required by EditorTransformComponentSelection.
     };
 
     // constructor for EntityData to support emplace_back in vector
     EntityData::EntityData(
-        const AZ::EntityId entityId, const AZ::Transform& worldFromLocal,
-        const bool locked, const bool visible, const bool selected, const bool iconHidden)
-        : m_worldFromLocal(worldFromLocal), m_entityId(entityId)
-        , m_locked(locked), m_visible(visible), m_selected(selected)
-        , m_iconHidden(iconHidden) {}
+        const AZ::EntityId entityId,
+        const AZ::Transform& worldFromLocal,
+        const bool locked,
+        const bool visible,
+        const bool selected,
+        const bool iconHidden)
+        : m_worldFromLocal(worldFromLocal)
+        , m_entityId(entityId)
+        , m_locked(locked)
+        , m_visible(visible)
+        , m_selected(selected)
+        , m_iconHidden(iconHidden)
+    {
+    }
 
     bool EntityDataComparer::operator()(const AZ::EntityId lhs, const EntityData& rhs) const
     {
@@ -98,20 +105,17 @@ namespace AzToolsFramework
     static EntityData EntityDataFromEntityId(const AZ::EntityId entityId)
     {
         bool visible = false;
-        EditorEntityInfoRequestBus::EventResult(
-            visible, entityId, &EditorEntityInfoRequestBus::Events::IsVisible);
+        EditorEntityInfoRequestBus::EventResult(visible, entityId, &EditorEntityInfoRequestBus::Events::IsVisible);
 
         bool locked = false;
-        EditorEntityInfoRequestBus::EventResult(
-            locked, entityId, &EditorEntityInfoRequestBus::Events::IsLocked);
+        EditorEntityInfoRequestBus::EventResult(locked, entityId, &EditorEntityInfoRequestBus::Events::IsLocked);
 
         bool iconHidden = false;
         EditorEntityIconComponentRequestBus::EventResult(
             iconHidden, entityId, &EditorEntityIconComponentRequests::IsEntityIconHiddenInViewport);
 
         AZ::Transform worldFromLocal = AZ::Transform::CreateIdentity();
-        AZ::TransformBus::EventResult(
-            worldFromLocal, entityId, &AZ::TransformBus::Events::GetWorldTM);
+        AZ::TransformBus::EventResult(worldFromLocal, entityId, &AZ::TransformBus::Events::GetWorldTM);
 
         return { entityId, worldFromLocal, locked, visible, IsSelected(entityId), iconHidden };
     }
@@ -155,16 +159,14 @@ namespace AzToolsFramework
         AZStd::sort(m_impl->m_visibleEntityDatas.begin(), m_impl->m_visibleEntityDatas.end());
     }
 
-    void EditorVisibleEntityDataCache::CalculateVisibleEntityDatas(
-        const AzFramework::ViewportInfo& viewportInfo)
+    void EditorVisibleEntityDataCache::CalculateVisibleEntityDatas(const AzFramework::ViewportInfo& viewportInfo)
     {
         AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
 
         // request list of visible entities from authoritative system
         EntityIdList nextVisibleEntityIds;
         ViewportInteraction::MainEditorViewportInteractionRequestBus::Event(
-            viewportInfo.m_viewportId,
-            &ViewportInteraction::MainEditorViewportInteractionRequestBus::Events::FindVisibleEntities,
+            viewportInfo.m_viewportId, &ViewportInteraction::MainEditorViewportInteractionRequestBus::Events::FindVisibleEntities,
             nextVisibleEntityIds);
 
         // only bother resorting if we know the lists have changed
@@ -181,31 +183,26 @@ namespace AzToolsFramework
             // find entities that are visible this frame but weren't last frame
             AZStd::vector<AZ::EntityId> added;
             std::set_difference(
-                m_impl->m_visibleEntityIds.begin(), m_impl->m_visibleEntityIds.end(),
-                m_impl->m_visibleEntityDatas.begin(), m_impl->m_visibleEntityDatas.end(),
-                std::back_inserter(added), EntityDataComparer());
+                m_impl->m_visibleEntityIds.begin(), m_impl->m_visibleEntityIds.end(), m_impl->m_visibleEntityDatas.begin(),
+                m_impl->m_visibleEntityDatas.end(), std::back_inserter(added), EntityDataComparer());
 
             // find entities that are not visible this frame but were last frame
             AZStd::vector<EntityData> removed;
             std::set_difference(
-                m_impl->m_visibleEntityDatas.begin(), m_impl->m_visibleEntityDatas.end(),
-                m_impl->m_visibleEntityIds.begin(), m_impl->m_visibleEntityIds.end(),
-                std::back_inserter(removed), EntityDataComparer());
+                m_impl->m_visibleEntityDatas.begin(), m_impl->m_visibleEntityDatas.end(), m_impl->m_visibleEntityIds.begin(),
+                m_impl->m_visibleEntityIds.end(), std::back_inserter(removed), EntityDataComparer());
 
             // search for entityData in removed list, return true if it is found
             const auto removePredicate = [&removed](const EntityData& entityData)
             {
-                const auto removeIt = std::equal_range(
-                    removed.begin(), removed.end(), entityData);
+                const auto removeIt = std::equal_range(removed.begin(), removed.end(), entityData);
 
                 return removeIt.first != removeIt.second;
             };
 
             // erase-remove idiom - bubble entities to be removed to the end, then erase them in one go
             m_impl->m_visibleEntityDatas.erase(
-                AZStd::remove_if(
-                    m_impl->m_visibleEntityDatas.begin(),
-                    m_impl->m_visibleEntityDatas.end(), removePredicate),
+                AZStd::remove_if(m_impl->m_visibleEntityDatas.begin(), m_impl->m_visibleEntityDatas.end(), removePredicate),
                 m_impl->m_visibleEntityDatas.end());
 
             // for newly added entities, request their initial state when first cached
@@ -240,8 +237,7 @@ namespace AzToolsFramework
         return m_impl->m_visibleEntityDatas[index].m_entityId;
     }
 
-    EditorVisibleEntityDataCache::ComponentEntityAccentType EditorVisibleEntityDataCache::GetVisibleEntityAccent(
-        const size_t index) const
+    EditorVisibleEntityDataCache::ComponentEntityAccentType EditorVisibleEntityDataCache::GetVisibleEntityAccent(const size_t index) const
     {
         return m_impl->m_visibleEntityDatas[index].m_accent;
     }
@@ -273,8 +269,8 @@ namespace AzToolsFramework
 
     AZStd::optional<size_t> EditorVisibleEntityDataCache::GetVisibleEntityIndexFromId(const AZ::EntityId entityId) const
     {
-        const auto entityIdIt = std::equal_range(
-            m_impl->m_visibleEntityDatas.begin(), m_impl->m_visibleEntityDatas.end(), entityId, EntityDataComparer());
+        const auto entityIdIt =
+            std::equal_range(m_impl->m_visibleEntityDatas.begin(), m_impl->m_visibleEntityDatas.end(), entityId, EntityDataComparer());
 
         if (entityIdIt.first != entityIdIt.second)
         {
@@ -318,8 +314,7 @@ namespace AzToolsFramework
         }
     }
 
-    void EditorVisibleEntityDataCache::OnTransformChanged(
-        const AZ::Transform& /*local*/, const AZ::Transform& world)
+    void EditorVisibleEntityDataCache::OnTransformChanged(const AZ::Transform& /*local*/, const AZ::Transform& world)
     {
         AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
 
@@ -367,8 +362,7 @@ namespace AzToolsFramework
         }
     }
 
-    void EditorVisibleEntityDataCache::OnEntityIconChanged(
-        const AZ::Data::AssetId& /*entityIconAssetId*/)
+    void EditorVisibleEntityDataCache::OnEntityIconChanged(const AZ::Data::AssetId& /*entityIconAssetId*/)
     {
         AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
 
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorVisibleEntityDataCache.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorVisibleEntityDataCache.h
index 72c1595e7b..0d74825bf8 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorVisibleEntityDataCache.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorVisibleEntityDataCache.h
@@ -1,14 +1,14 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
 #pragma once
 
@@ -22,8 +22,8 @@
 
 namespace AzToolsFramework
 {
-    /// A cache of packed EntityData that can be iterated over efficiently without
-    /// the need to make individual EBus calls
+    //! A cache of packed EntityData that can be iterated over efficiently without
+    //! the need to make individual EBus calls
     class EditorVisibleEntityDataCache
         : private EditorEntityVisibilityNotificationBus::Router
         , private EditorEntityLockComponentNotificationBus::Router
@@ -45,7 +45,7 @@ namespace AzToolsFramework
 
         void CalculateVisibleEntityDatas(const AzFramework::ViewportInfo& viewportInfo);
 
-        /// EditorVisibleEntityDataCache interface
+        //! EditorVisibleEntityDataCache interface
         size_t VisibleEntityDataCount() const;
         AZ::Vector3 GetVisibleEntityPosition(size_t index) const;
         const AZ::Transform& GetVisibleEntityTransform(size_t index) const;
@@ -72,8 +72,7 @@ namespace AzToolsFramework
         void OnEntityLockChanged(bool locked) override;
 
         // TransformNotificationBus
-        void OnTransformChanged(
-            const AZ::Transform& local, const AZ::Transform& world) override;
+        void OnTransformChanged(const AZ::Transform& local, const AZ::Transform& world) override;
 
         // EditorComponentSelectionNotificationsBus
         void OnAccentTypeChanged(EntityAccentType accent) override;
@@ -86,6 +85,6 @@ namespace AzToolsFramework
         void OnEntityIconChanged(const AZ::Data::AssetId& entityIconAssetId) override;
 
         class EditorVisibleEntityDataCacheImpl;
-        AZStd::unique_ptr<EditorVisibleEntityDataCacheImpl> m_impl; ///< Internal representation of entity data cache.
+        AZStd::unique_ptr<EditorVisibleEntityDataCacheImpl> m_impl; //!< Internal representation of entity data cache.
     };
 } // namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiCluster.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiCluster.cpp
index 79744f1dbf..d452d47508 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiCluster.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiCluster.cpp
@@ -108,6 +108,61 @@ namespace AzToolsFramework::ViewportUi::Internal
         m_widgetCallbacks.Update();
     }
 
+    void ViewportUiCluster::SetButtonLocked(const ButtonId buttonId, const bool isLocked)
+    {
+        const auto& buttons = m_buttonGroup->GetButtons();
+
+        // unlocked previously locked button
+        if (m_lockedButtonId.has_value() && isLocked)
+        {
+            // find the button to extract the old icon (without overlay)
+            auto findLocked = [this](const Button* button) { return (button->m_buttonId == m_lockedButtonId); };
+            if (auto lockedButtonIt = AZStd::find_if(buttons.begin(), buttons.end(), findLocked); lockedButtonIt != buttons.end())
+            {
+                // get the action corresponding to the lockedButtonId 
+                if (auto actionEntry = m_buttonActionMap.find(m_lockedButtonId.value()); actionEntry != m_buttonActionMap.end())
+                {
+                    // remove the overlay
+                    auto action = actionEntry->second;
+                    action->setIcon(QIcon(QString((*lockedButtonIt)->m_icon.c_str())));
+                }
+            }
+        }
+
+        auto found = [buttonId](Button* button) { return (button->m_buttonId == buttonId); };
+        if (auto buttonIt = AZStd::find_if(buttons.begin(), buttons.end(), found); buttonIt != buttons.end())
+        {
+            QIcon newIcon;
+
+            if (isLocked)
+            {
+                // overlay the locked icon ontop of the button's icon
+                QPixmap comboPixmap(24, 24);
+                comboPixmap.fill(Qt::transparent);
+                QPixmap firstImage(QString((*buttonIt)->m_icon.c_str()));
+                QPixmap secondImage(QString(":/stylesheet/img/UI20/toolbar/Locked_Status.svg"));
+
+                QPainter painter(&comboPixmap);
+                painter.drawPixmap(0, 0, firstImage);
+                painter.drawPixmap(0, 0, secondImage);
+                newIcon.addPixmap(comboPixmap);
+                m_lockedButtonId = buttonId;
+            }
+            else
+            {
+                // remove the overlay
+                newIcon = QIcon(QString((*buttonIt)->m_icon.c_str()));
+                m_lockedButtonId = AZStd::nullopt;
+            }
+
+            if (auto actionEntry = m_buttonActionMap.find(buttonId); actionEntry != m_buttonActionMap.end())
+            {
+                auto action = actionEntry->second;
+                action->setIcon(newIcon);
+            }
+        }
+    }
+
     ViewportUiWidgetCallbacks ViewportUiCluster::GetWidgetCallbacks()
     {
         return m_widgetCallbacks;
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiCluster.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiCluster.h
index 4f738177ea..027a201a9c 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiCluster.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiCluster.h
@@ -17,6 +17,7 @@
 #include <AzToolsFramework/ViewportUi/Button.h>
 #include <AzToolsFramework/ViewportUi/ViewportUiWidgetCallbacks.h>
 #include <QToolBar>
+#include <QPainter>
 
 namespace AzToolsFramework::ViewportUi::Internal
 {
@@ -38,6 +39,8 @@ namespace AzToolsFramework::ViewportUi::Internal
         void RemoveButton(ButtonId buttonId);
         //! Updates all registered actions.
         void Update();
+        //! Adds a locked overlay to the button's icon.
+        void SetButtonLocked(ButtonId buttonId, bool isLocked);
         //! Returns the widget manager.
         ViewportUiWidgetCallbacks GetWidgetCallbacks();
 
@@ -52,5 +55,6 @@ namespace AzToolsFramework::ViewportUi::Internal
         AZStd::shared_ptr<ButtonGroup> m_buttonGroup; //!< Data structure which the cluster will be displaying to the Viewport UI.
         AZStd::unordered_map<ButtonId, QPointer<QAction>> m_buttonActionMap; //!< Map for buttons to their corresponding actions.
         ViewportUiWidgetCallbacks m_widgetCallbacks; //!< Registers actions and manages updates.
+        AZStd::optional<ButtonId> m_lockedButtonId = AZStd::nullopt; //!< Used to track the last button locked.
     };
 } // namespace AzToolsFramework::ViewportUi::Internal
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp
index e9e7dcc1cc..3565d33174 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp
@@ -100,6 +100,14 @@ namespace AzToolsFramework::ViewportUi::Internal
         }
     }
 
+    void ViewportUiDisplay::SetClusterButtonLocked(const ViewportUiElementId clusterId, const ButtonId buttonId, const bool isLocked)
+    {
+        if (auto viewportUiCluster = qobject_cast<ViewportUiCluster*>(GetViewportUiElement(clusterId).get()))
+        {
+            viewportUiCluster->SetButtonLocked(buttonId, isLocked);
+        }
+    }
+
     void ViewportUiDisplay::RemoveClusterButton(ViewportUiElementId clusterId, ButtonId buttonId)
     {
         if (auto cluster = qobject_cast<ViewportUiCluster*>(GetViewportUiElement(clusterId).get()))
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.h
index d46e01c978..19d04e63ff 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.h
@@ -58,6 +58,7 @@ namespace AzToolsFramework::ViewportUi::Internal
 
         void AddCluster(AZStd::shared_ptr<ButtonGroup> buttonGroup, Alignment align);
         void AddClusterButton(ViewportUiElementId clusterId, Button* button);
+        void SetClusterButtonLocked(ViewportUiElementId clusterId, ButtonId buttonId, bool isLocked);
         void RemoveClusterButton(ViewportUiElementId clusterId, ButtonId buttonId);
         void UpdateCluster(const ViewportUiElementId clusterId);
 
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiManager.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiManager.cpp
index 12c3b5c9bb..0668af383b 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiManager.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiManager.cpp
@@ -67,6 +67,16 @@ namespace AzToolsFramework::ViewportUi
         }
     }
 
+    void ViewportUiManager::SetClusterButtonLocked(const ClusterId clusterId, const ButtonId buttonId, const bool isLocked)
+    {
+        if (auto clusterIt = m_clusterButtonGroups.find(clusterId); clusterIt != m_clusterButtonGroups.end())
+        {
+            auto cluster = clusterIt->second;
+            m_viewportUi->SetClusterButtonLocked(cluster->GetViewportUiElementId(), buttonId, isLocked);
+            UpdateButtonGroupUi(cluster.get());
+        }
+    }
+
     void ViewportUiManager::RegisterClusterEventHandler(const ClusterId clusterId, AZ::Event<ButtonId>::Handler& handler)
     {
         if (auto clusterIt = m_clusterButtonGroups.find(clusterId); clusterIt != m_clusterButtonGroups.end())
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiManager.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiManager.h
index 04a58cef65..14609ccc14 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiManager.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiManager.h
@@ -35,6 +35,7 @@ namespace AzToolsFramework::ViewportUi
         const SwitcherId CreateSwitcher(Alignment align) override;
         void SetClusterActiveButton(ClusterId clusterId, ButtonId buttonId) override;
         void SetSwitcherActiveButton(SwitcherId switcherId, ButtonId buttonId) override;
+        void SetClusterButtonLocked(ClusterId clusterId, ButtonId buttonId, bool isLocked) override;
         const ButtonId CreateClusterButton(ClusterId clusterId, const AZStd::string& icon) override;
         const ButtonId CreateSwitcherButton(
             SwitcherId switcherId, const AZStd::string& icon, const AZStd::string& name = AZStd::string()) override;
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiRequestBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiRequestBus.h
index 3879817ccb..a068ffe9ee 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiRequestBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiRequestBus.h
@@ -65,6 +65,8 @@ namespace AzToolsFramework::ViewportUi
         virtual void SetClusterActiveButton(ClusterId clusterId, ButtonId buttonId) = 0;
         //! Sets the active button of the switcher. This is the button which has a text label.
         virtual void SetSwitcherActiveButton(SwitcherId clusterId, ButtonId buttonId) = 0;
+        //! Adds a locked overlay to the cluster button's icon.
+        virtual void SetClusterButtonLocked(ClusterId clusterId, ButtonId buttonId, bool isLocked) = 0;
         //! Registers a new button onto a cluster.
         virtual const ButtonId CreateClusterButton(const ClusterId clusterId, const AZStd::string& icon) = 0;
         //! Registers a new button onto a switcher.
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_files.cmake b/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_files.cmake
index b4b04c0b35..9ec0deaed6 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_files.cmake
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_files.cmake
@@ -11,7 +11,6 @@
 
 set(FILES
     AzToolsFramework_precompiled.h
-    AzToolsFramework_precompiled.cpp
     AssetEditor/AssetEditorBus.h
     AssetEditor/AssetEditorToolbar.ui
     AssetEditor/AssetEditorStatusBar.ui
diff --git a/Code/Framework/AzToolsFramework/Tests/ComponentModeTests.cpp b/Code/Framework/AzToolsFramework/Tests/ComponentModeTests.cpp
index a4ee80fa5f..45699ddb78 100644
--- a/Code/Framework/AzToolsFramework/Tests/ComponentModeTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/ComponentModeTests.cpp
@@ -1,30 +1,31 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
 #include "ComponentModeTestDoubles.h"
 #include "ComponentModeTestFixture.h"
 
 #include <AzCore/Serialization/SerializeContext.h>
+#include <AzCore/UnitTest/TestTypes.h>
 #include <AzFramework/Components/TransformComponent.h>
 #include <AzFramework/Entity/EntityContext.h>
 #include <AzTest/AzTest.h>
-#include <AzToolsFramework/Application/ToolsApplication.h>
 #include <AzToolsFramework/API/EntityCompositionRequestBus.h>
+#include <AzToolsFramework/Application/ToolsApplication.h>
 #include <AzToolsFramework/ComponentMode/ComponentModeCollection.h>
 #include <AzToolsFramework/ComponentMode/EditorComponentModeBus.h>
 #include <AzToolsFramework/Entity/EditorEntityHelpers.h>
 #include <AzToolsFramework/ToolsComponents/EditorLockComponent.h>
-#include <AzToolsFramework/ToolsComponents/EditorVisibilityComponent.h>
 #include <AzToolsFramework/ToolsComponents/EditorPendingCompositionBus.h>
+#include <AzToolsFramework/ToolsComponents/EditorVisibilityComponent.h>
 #include <AzToolsFramework/ToolsComponents/TransformComponent.h>
 #include <AzToolsFramework/UI/PropertyEditor/EntityPropertyEditor.hxx>
 #include <AzToolsFramework/UnitTest/AzToolsFrameworkTestHelpers.h>
@@ -32,7 +33,6 @@
 #include <AzToolsFramework/ViewportSelection/EditorDefaultSelection.h>
 #include <AzToolsFramework/ViewportSelection/EditorInteractionSystemViewportSelectionRequestBus.h>
 #include <AzToolsFramework/ViewportSelection/EditorVisibleEntityDataCache.h>
-#include <AzCore/UnitTest/TestTypes.h>
 #include <QApplication>
 
 namespace UnitTest
@@ -47,19 +47,16 @@ namespace UnitTest
         ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
         // Given
         QWidget rootWidget;
-        ActionOverrideRequestBus::Event(
-            GetEntityContextId(), &ActionOverrideRequests::SetupActionOverrideHandler, &rootWidget);
+        ActionOverrideRequestBus::Event(GetEntityContextId(), &ActionOverrideRequests::SetupActionOverrideHandler, &rootWidget);
         ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
         ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
         // When
         ComponentModeSystemRequestBus::Broadcast(
-            &ComponentModeSystemRequests::BeginComponentMode,
-            AZStd::vector<EntityAndComponentModeBuilders>{});
+            &ComponentModeSystemRequests::BeginComponentMode, AZStd::vector<EntityAndComponentModeBuilders>{});
 
         bool inComponentMode = false;
-        ComponentModeSystemRequestBus::BroadcastResult(
-            inComponentMode, &ComponentModeSystemRequests::InComponentMode);
+        ComponentModeSystemRequestBus::BroadcastResult(inComponentMode, &ComponentModeSystemRequests::InComponentMode);
         ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
         ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -69,11 +66,9 @@ namespace UnitTest
 
         ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
         // When
-        ComponentModeSystemRequestBus::Broadcast(
-            &ComponentModeSystemRequests::EndComponentMode);
+        ComponentModeSystemRequestBus::Broadcast(&ComponentModeSystemRequests::EndComponentMode);
 
-        ComponentModeSystemRequestBus::BroadcastResult(
-            inComponentMode, &ComponentModeSystemRequests::InComponentMode);
+        ComponentModeSystemRequestBus::BroadcastResult(inComponentMode, &ComponentModeSystemRequests::InComponentMode);
         ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
         ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -81,8 +76,7 @@ namespace UnitTest
         EXPECT_FALSE(inComponentMode);
         ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-        ActionOverrideRequestBus::Event(
-            GetEntityContextId(), &ActionOverrideRequests::TeardownActionOverrideHandler);
+        ActionOverrideRequestBus::Event(GetEntityContextId(), &ActionOverrideRequests::TeardownActionOverrideHandler);
     }
 
     TEST_F(ComponentModeTestFixture, TwoComponentsOnSingleEntityWithSameComponentModeBothBegin)
@@ -104,8 +98,7 @@ namespace UnitTest
         // mimic selecting the entity in the viewport (after selection the ComponentModeDelegate
         // connects to the ComponentModeDelegateRequestBus on the entity/component pair address)
         const AzToolsFramework::EntityIdList entityIds = { entityId };
-        ToolsApplicationRequestBus::Broadcast(
-            &ToolsApplicationRequests::SetSelectedEntities, entityIds);
+        ToolsApplicationRequestBus::Broadcast(&ToolsApplicationRequests::SetSelectedEntities, entityIds);
         ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
         ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -113,8 +106,7 @@ namespace UnitTest
         // move all selected components into ComponentMode
         // (mimic pressing the 'Edit' button to begin Component Mode)
         ComponentModeSystemRequestBus::Broadcast(
-            &ComponentModeSystemRequests::AddSelectedComponentModesOfType,
-            AZ::AzTypeInfo<PlaceholderEditorComponent>::Uuid());
+            &ComponentModeSystemRequests::AddSelectedComponentModesOfType, AZ::AzTypeInfo<PlaceholderEditorComponent>::Uuid());
         ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
         ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -152,8 +144,7 @@ namespace UnitTest
         // mimic selecting the entity in the viewport (after selection the ComponentModeDelegate
         // connects to the ComponentModeDelegateRequestBus on the entity/component pair address)
         const AzToolsFramework::EntityIdList entityIds = { entityId };
-        ToolsApplicationRequestBus::Broadcast(
-            &ToolsApplicationRequests::SetSelectedEntities, entityIds);
+        ToolsApplicationRequestBus::Broadcast(&ToolsApplicationRequests::SetSelectedEntities, entityIds);
         ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
         ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -161,8 +152,7 @@ namespace UnitTest
         // move all selected components into ComponentMode
         // (mimic pressing the 'Edit' button to begin Component Mode)
         ComponentModeSystemRequestBus::Broadcast(
-            &ComponentModeSystemRequests::AddSelectedComponentModesOfType,
-            AZ::AzTypeInfo<PlaceholderEditorComponent>::Uuid());
+            &ComponentModeSystemRequests::AddSelectedComponentModesOfType, AZ::AzTypeInfo<PlaceholderEditorComponent>::Uuid());
         ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
         ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -202,8 +192,7 @@ namespace UnitTest
         // mimic selecting the entity in the viewport (after selection the ComponentModeDelegate
         // connects to the ComponentModeDelegateRequestBus on the entity/component pair address)
         const AzToolsFramework::EntityIdList entityIds = { entityId };
-        ToolsApplicationRequestBus::Broadcast(
-            &ToolsApplicationRequests::SetSelectedEntities, entityIds);
+        ToolsApplicationRequestBus::Broadcast(&ToolsApplicationRequests::SetSelectedEntities, entityIds);
         ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
         ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -211,16 +200,13 @@ namespace UnitTest
         // move all selected components into ComponentMode
         // (mimic pressing the 'Edit' button to begin Component Mode)
         ComponentModeSystemRequestBus::Broadcast(
-            &ComponentModeSystemRequests::AddSelectedComponentModesOfType,
-            AZ::AzTypeInfo<PlaceholderEditorComponent>::Uuid());
+            &ComponentModeSystemRequests::AddSelectedComponentModesOfType, AZ::AzTypeInfo<PlaceholderEditorComponent>::Uuid());
 
         bool nextModeCycled = true;
-        ComponentModeSystemRequestBus::BroadcastResult(
-            nextModeCycled, &ComponentModeSystemRequests::SelectNextActiveComponentMode);
+        ComponentModeSystemRequestBus::BroadcastResult(nextModeCycled, &ComponentModeSystemRequests::SelectNextActiveComponentMode);
 
         bool previousModeCycled = true;
-        ComponentModeSystemRequestBus::BroadcastResult(
-            previousModeCycled, &ComponentModeSystemRequests::SelectPreviousActiveComponentMode);
+        ComponentModeSystemRequestBus::BroadcastResult(previousModeCycled, &ComponentModeSystemRequests::SelectPreviousActiveComponentMode);
         ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
         ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -250,8 +236,7 @@ namespace UnitTest
         // mimic selecting the entity in the viewport (after selection the ComponentModeDelegate
         // connects to the ComponentModeDelegateRequestBus on the entity/component pair address)
         const AzToolsFramework::EntityIdList entityIds = { entityId };
-        ToolsApplicationRequestBus::Broadcast(
-            &ToolsApplicationRequests::SetSelectedEntities, entityIds);
+        ToolsApplicationRequestBus::Broadcast(&ToolsApplicationRequests::SetSelectedEntities, entityIds);
         ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
         ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -259,15 +244,13 @@ namespace UnitTest
         // move all selected components into ComponentMode
         // (mimic pressing the 'Edit' button to begin Component Mode)
         ComponentModeSystemRequestBus::Broadcast(
-            &ComponentModeSystemRequests::AddSelectedComponentModesOfType,
-            AZ::AzTypeInfo<PlaceholderEditorComponent>::Uuid());
+            &ComponentModeSystemRequests::AddSelectedComponentModesOfType, AZ::AzTypeInfo<PlaceholderEditorComponent>::Uuid());
         ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
         ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
         // Then
         bool multipleComponentModeTypes = true;
-        ComponentModeSystemRequestBus::BroadcastResult(
-            multipleComponentModeTypes, &ComponentModeSystemRequests::HasMultipleComponentTypes);
+        ComponentModeSystemRequestBus::BroadcastResult(multipleComponentModeTypes, &ComponentModeSystemRequests::HasMultipleComponentTypes);
 
         EXPECT_FALSE(multipleComponentModeTypes);
         ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -294,8 +277,7 @@ namespace UnitTest
         // mimic selecting the entity in the viewport (after selection the ComponentModeDelegate
         // connects to the ComponentModeDelegateRequestBus on the entity/component pair address)
         const AzToolsFramework::EntityIdList entityIds = { entityId };
-        ToolsApplicationRequestBus::Broadcast(
-            &ToolsApplicationRequests::SetSelectedEntities, entityIds);
+        ToolsApplicationRequestBus::Broadcast(&ToolsApplicationRequests::SetSelectedEntities, entityIds);
         ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
         ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -303,15 +285,13 @@ namespace UnitTest
         // move all selected components into ComponentMode
         // (mimic pressing the 'Edit' button to begin Component Mode)
         ComponentModeSystemRequestBus::Broadcast(
-            &ComponentModeSystemRequests::AddSelectedComponentModesOfType,
-            AZ::AzTypeInfo<AnotherPlaceholderEditorComponent>::Uuid());
+            &ComponentModeSystemRequests::AddSelectedComponentModesOfType, AZ::AzTypeInfo<AnotherPlaceholderEditorComponent>::Uuid());
         ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
         ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
         // Then
         bool multipleComponentModeTypes = true;
-        ComponentModeSystemRequestBus::BroadcastResult(
-            multipleComponentModeTypes, &ComponentModeSystemRequests::HasMultipleComponentTypes);
+        ComponentModeSystemRequestBus::BroadcastResult(multipleComponentModeTypes, &ComponentModeSystemRequests::HasMultipleComponentTypes);
 
         EXPECT_FALSE(multipleComponentModeTypes);
         ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -341,8 +321,7 @@ namespace UnitTest
         // mimic selecting the entity in the viewport (after selection the ComponentModeDelegate
         // connects to the ComponentModeDelegateRequestBus on the entity/component pair address)
         const AzToolsFramework::EntityIdList entityIds = { entityId };
-        ToolsApplicationRequestBus::Broadcast(
-            &ToolsApplicationRequests::SetSelectedEntities, entityIds);
+        ToolsApplicationRequestBus::Broadcast(&ToolsApplicationRequests::SetSelectedEntities, entityIds);
         ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
         ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -350,15 +329,13 @@ namespace UnitTest
         // move all selected components into ComponentMode
         // (mimic pressing the 'Edit' button to begin Component Mode)
         ComponentModeSystemRequestBus::Broadcast(
-            &ComponentModeSystemRequests::AddSelectedComponentModesOfType,
-            AZ::AzTypeInfo<DependentPlaceholderEditorComponent>::Uuid());
+            &ComponentModeSystemRequests::AddSelectedComponentModesOfType, AZ::AzTypeInfo<DependentPlaceholderEditorComponent>::Uuid());
         ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
         ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
         // Then
         bool multipleComponentModeTypes = false;
-        ComponentModeSystemRequestBus::BroadcastResult(
-            multipleComponentModeTypes, &ComponentModeSystemRequests::HasMultipleComponentTypes);
+        ComponentModeSystemRequestBus::BroadcastResult(multipleComponentModeTypes, &ComponentModeSystemRequests::HasMultipleComponentTypes);
 
         bool secondComponentModeInstantiated = false;
         ComponentModeSystemRequestBus::BroadcastResult(
@@ -366,8 +343,7 @@ namespace UnitTest
             AZ::EntityComponentIdPair(entityId, placeholder2->GetId()));
 
         AZ::Uuid activeComponentType = AZ::Uuid::CreateNull();
-        ComponentModeSystemRequestBus::BroadcastResult(
-            activeComponentType, &ComponentModeSystemRequests::ActiveComponentMode);
+        ComponentModeSystemRequestBus::BroadcastResult(activeComponentType, &ComponentModeSystemRequests::ActiveComponentMode);
 
         EXPECT_TRUE(multipleComponentModeTypes);
         EXPECT_TRUE(secondComponentModeInstantiated);
@@ -412,13 +388,11 @@ namespace UnitTest
         // Component Mode is will sent the notification to the correct address.
         ComponentModeActionSignalRequestBus::Event(
             AZ::EntityComponentIdPair(entityId, placeholder1->GetId()),
-            &ComponentModeActionSignalRequests::SetComponentModeActionNotificationBusToNotify,
-            checkerBusId);
+            &ComponentModeActionSignalRequests::SetComponentModeActionNotificationBusToNotify, checkerBusId);
 
         ComponentModeActionSignalRequestBus::Event(
             AZ::EntityComponentIdPair(entityId, placeholder2->GetId()),
-            &ComponentModeActionSignalRequests::SetComponentModeActionNotificationBusToNotify,
-            checkerBusId);
+            &ComponentModeActionSignalRequests::SetComponentModeActionNotificationBusToNotify, checkerBusId);
         ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
         ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -470,8 +444,7 @@ namespace UnitTest
         using MouseInteractionResult = AzToolsFramework::ViewportInteraction::MouseInteractionResult;
         MouseInteractionResult handled = MouseInteractionResult::None;
         EditorInteractionSystemViewportSelectionRequestBus::BroadcastResult(
-            handled, &EditorInteractionSystemViewportSelectionRequestBus::Events::InternalHandleAllMouseInteractions,
-            interactionEvent);
+            handled, &EditorInteractionSystemViewportSelectionRequestBus::Events::InternalHandleAllMouseInteractions, interactionEvent);
         ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
         ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -482,8 +455,7 @@ namespace UnitTest
     }
 
     // Test version of EntityPropertyEditor to detect/ensure certain functions were called
-    class TestEntityPropertyEditor
-        : public AzToolsFramework::EntityPropertyEditor
+    class TestEntityPropertyEditor : public AzToolsFramework::EntityPropertyEditor
     {
     public:
         void InvalidatePropertyDisplay(PropertyModificationRefreshLevel level) override;
@@ -496,8 +468,7 @@ namespace UnitTest
     }
 
     // Simple fixture to encapsulate a TestEntityPropertyEditor
-    class ComponentModePinnedSelectionFixture
-        : public ToolsApplicationFixture
+    class ComponentModePinnedSelectionFixture : public ToolsApplicationFixture
     {
     public:
         void SetUpEditorFixtureImpl() override
@@ -533,7 +504,7 @@ namespace UnitTest
         ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
         // When
         // select entity
-        const auto selectedEntities = AzToolsFramework::EntityIdList { entityId };
+        const auto selectedEntities = AzToolsFramework::EntityIdList{ entityId };
         SelectEntities(selectedEntities);
 
         // pin entity
@@ -549,8 +520,7 @@ namespace UnitTest
         EXPECT_TRUE(m_testEntityPropertyEditor->IsLockedToSpecificEntities());
         EXPECT_TRUE(m_testEntityPropertyEditor->m_invalidatePropertyDisplayCalled);
 
-        bool couldBeginComponentMode =
-            AzToolsFramework::ComponentModeFramework::CouldBeginComponentModeWithEntity(entityId);
+        bool couldBeginComponentMode = AzToolsFramework::ComponentModeFramework::CouldBeginComponentModeWithEntity(entityId);
 
         EXPECT_FALSE(couldBeginComponentMode);
         ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -566,29 +536,26 @@ namespace UnitTest
         entity->Deactivate();
 
         AzToolsFramework::EntityCompositionRequestBus::Broadcast(
-            &AzToolsFramework::EntityCompositionRequestBus::Events::AddComponentsToEntities,
-            AzToolsFramework::EntityIdList{entityId},
+            &AzToolsFramework::EntityCompositionRequestBus::Events::AddComponentsToEntities, AzToolsFramework::EntityIdList{ entityId },
             AZ::ComponentTypeList{ AZ::AzTypeInfo<AnotherPlaceholderEditorComponent>::Uuid() });
 
         AzToolsFramework::EntityCompositionRequestBus::Broadcast(
-            &AzToolsFramework::EntityCompositionRequestBus::Events::AddComponentsToEntities,
-            AzToolsFramework::EntityIdList{entityId},
-            AZ::ComponentTypeList{AZ::AzTypeInfo<IncompatiblePlaceholderEditorComponent>::Uuid()});
+            &AzToolsFramework::EntityCompositionRequestBus::Events::AddComponentsToEntities, AzToolsFramework::EntityIdList{ entityId },
+            AZ::ComponentTypeList{ AZ::AzTypeInfo<IncompatiblePlaceholderEditorComponent>::Uuid() });
 
         entity->Activate();
         ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
         ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
         // When
-        SelectEntities(AzToolsFramework::EntityIdList{entityId});
+        SelectEntities(AzToolsFramework::EntityIdList{ entityId });
         ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
         ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
         // Then
         AZ::Entity::ComponentArrayType pendingComponents;
         AzToolsFramework::EditorPendingCompositionRequestBus::Event(
-            entityId, &AzToolsFramework::EditorPendingCompositionRequestBus::Events::GetPendingComponents,
-            pendingComponents);
+            entityId, &AzToolsFramework::EditorPendingCompositionRequestBus::Events::GetPendingComponents, pendingComponents);
 
         // ensure we do have pending components
         EXPECT_EQ(pendingComponents.size(), 1);
diff --git a/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabEntityAliasTests.cpp b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabEntityAliasTests.cpp
index 0cf39a3572..458625fa3f 100644
--- a/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabEntityAliasTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabEntityAliasTests.cpp
@@ -242,6 +242,7 @@ namespace UnitTest
 
         // Patch the nested prefab to reference an entity in its parent
         ASSERT_TRUE(m_instanceToTemplateInterface->PatchEntityInTemplate(patch, newEntity->GetId()));
+        m_instanceUpdateExecutorInterface->AddTemplateInstancesToQueue(rootInstance->GetTemplateId());
         m_instanceUpdateExecutorInterface->UpdateTemplateInstancesInQueue();
 
         // Using the aliases we saved grab the updated entities so we can verify the entity reference is still preserved
diff --git a/Code/Framework/Tests/ArchiveTests.cpp b/Code/Framework/Tests/ArchiveTests.cpp
index 6dc081ee72..ddc7060083 100644
--- a/Code/Framework/Tests/ArchiveTests.cpp
+++ b/Code/Framework/Tests/ArchiveTests.cpp
@@ -281,6 +281,39 @@ namespace UnitTest
         TestFGetCachedFileData(fileInArchiveFile, dataString.size(), dataString.data());
     }
 
+    TEST_F(ArchiveTestFixture, TestArchiveOpenPacks_FindsMultiplePaks_Works)
+    {
+        AZ::IO::IArchive* archive = AZ::Interface<AZ::IO::IArchive>::Get();
+        ASSERT_NE(nullptr, archive);
+
+        AZ::IO::FileIOBase* fileIo = AZ::IO::FileIOBase::GetInstance();
+        ASSERT_NE(nullptr, fileIo);
+
+        auto resetArchiveFile = [archive, fileIo](const AZStd::string& filePath)
+        {
+            archive->ClosePack(filePath.c_str());
+            fileIo->Remove(filePath.c_str());
+
+            auto pArchive = archive->OpenArchive(filePath.c_str(), nullptr, AZ::IO::INestedArchive::FLAGS_CREATE_NEW);
+            EXPECT_NE(nullptr, pArchive);
+            pArchive.reset();
+            archive->ClosePack(filePath.c_str());
+        };
+
+        AZStd::string testArchivePath_pakOne = "@usercache@/one.pak";
+        AZStd::string testArchivePath_pakTwo = "@usercache@/two.pak";
+
+        // reset test files in case they already exist
+        resetArchiveFile(testArchivePath_pakOne);
+        resetArchiveFile(testArchivePath_pakTwo);
+
+        // open and fetch the opened pak file using a *.pak
+        AZStd::vector<AZ::IO::FixedMaxPathString> fullPaths;
+        archive->OpenPacks("@usercache@/*.pak", AZ::IO::IArchive::EPathResolutionRules::FLAGS_PATH_REAL, &fullPaths);
+        EXPECT_TRUE(AZStd::any_of(fullPaths.cbegin(), fullPaths.cend(), [](auto& path) { return path.ends_with("one.pak"); }));
+        EXPECT_TRUE(AZStd::any_of(fullPaths.cbegin(), fullPaths.cend(), [](auto& path) { return path.ends_with("two.pak"); }));
+    }
+
     TEST_F(ArchiveTestFixture, TestArchiveFGetCachedFileData_LooseFile)
     {
         // ------setup loose file FGetCachedFileData tests -------------------------
diff --git a/Code/Sandbox/Editor/Core/LevelEditorMenuHandler.cpp b/Code/Sandbox/Editor/Core/LevelEditorMenuHandler.cpp
index 8f6e927a84..39c7ae43fd 100644
--- a/Code/Sandbox/Editor/Core/LevelEditorMenuHandler.cpp
+++ b/Code/Sandbox/Editor/Core/LevelEditorMenuHandler.cpp
@@ -473,18 +473,8 @@ void LevelEditorMenuHandler::PopulateEditMenu(ActionManager::MenuWrapper& editMe
     // editMenu->addAction(ID_EDIT_PASTE);
     // editMenu.AddSeparator();
 
-    bool isPrefabSystemEnabled = false;
-    AzFramework::ApplicationRequests::Bus::BroadcastResult(isPrefabSystemEnabled, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
-
-    bool prefabWipFeaturesEnabled = false;
-    AzFramework::ApplicationRequests::Bus::BroadcastResult(
-        prefabWipFeaturesEnabled, &AzFramework::ApplicationRequests::ArePrefabWipFeaturesEnabled);
-
-    if (!isPrefabSystemEnabled || (isPrefabSystemEnabled && prefabWipFeaturesEnabled))
-    {
-        // Duplicate
-        editMenu.AddAction(ID_EDIT_CLONE);
-    }
+    // Duplicate
+    editMenu.AddAction(ID_EDIT_CLONE);
 
     // Delete
     editMenu.AddAction(ID_EDIT_DELETE);
@@ -912,6 +902,12 @@ QAction* LevelEditorMenuHandler::CreateViewPaneAction(const QtViewPane* view)
         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())
@@ -941,6 +937,11 @@ QAction* LevelEditorMenuHandler::CreateViewPaneMenuItem(
 
     menu->addAction(action);
 
+    if (view->m_options.showOnToolsToolbar)
+    {
+        m_mainWindow->GetToolbarManager()->AddButtonToEditToolbar(action);
+    }
+
     return action;
 }
 
diff --git a/Code/Sandbox/Editor/InfoBar.cpp b/Code/Sandbox/Editor/InfoBar.cpp
deleted file mode 100644
index 14ef2e7f05..0000000000
--- a/Code/Sandbox/Editor/InfoBar.cpp
+++ /dev/null
@@ -1,394 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "EditorDefs.h"
-
-#include "InfoBar.h"
-
-// Editor
-#include "MainWindow.h"
-#include "DisplaySettings.h"
-#include "GameEngine.h"
-#include "Include/ITransformManipulator.h"
-#include "ActionManager.h"
-#include "Settings.h"
-#include "Include/IObjectManager.h"
-#include "MathConversion.h"
-
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-#include <ui_InfoBar.h>
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-#include <QLineEdit>
-
-#include <AzQtComponents/Components/Style.h>
-
-void BeautifyEulerAngles(Vec3& v)
-{
-    if (v.x + v.y + v.z >= 360.0f)
-    {
-        v.x = 180.0f - v.x;
-        v.y = 180.0f - v.y;
-        v.z = 180.0f - v.z;
-    }
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// CInfoBar dialog
-CInfoBar::CInfoBar(QWidget* parent)
-    : QWidget(parent)
-    , ui(new Ui::CInfoBar)
-{
-    ui->setupUi(this);
-
-    m_bSelectionChanged = false;
-    m_bDragMode = false;
-    m_prevMoveSpeed = 0;
-    m_currValue = Vec3(-111, +222, -333); //this wasn't initialized. I don't know what a good value is
-    m_oldMainVolume = 1.0f;
-
-    GetIEditor()->RegisterNotifyListener(this);
-
-    //audio request setup
-    m_oMuteAudioRequest.pData       = &m_oMuteAudioRequestData;
-    m_oUnmuteAudioRequest.pData = &m_oUnmuteAudioRequestData;
-
-    OnInitDialog();
-
-    auto comboBoxTextChanged = static_cast<void(QComboBox::*)(const QString&)>(&QComboBox::currentTextChanged);
-    connect(ui->m_moveSpeed, comboBoxTextChanged, this, &CInfoBar::OnUpdateMoveSpeedText);
-    connect(ui->m_moveSpeed->lineEdit(), &QLineEdit::returnPressed, this, &CInfoBar::OnSpeedComboBoxEnter);
-
-    // Hide some buttons from the expander menu
-    AzQtComponents::Style::addClass(ui->m_physDoStepBtn, "expanderMenu_hide");
-    AzQtComponents::Style::addClass(ui->m_physSingleStepBtn, "expanderMenu_hide");
-
-    connect(ui->m_physicsBtn, &QToolButton::clicked, this, &CInfoBar::OnBnClickedPhysics);
-    connect(ui->m_physSingleStepBtn, &QToolButton::clicked, this, &CInfoBar::OnBnClickedSingleStepPhys);
-    connect(ui->m_physDoStepBtn, &QToolButton::clicked, this, &CInfoBar::OnBnClickedDoStepPhys);
-    connect(ui->m_syncPlayerBtn, &QToolButton::clicked, this, &CInfoBar::OnBnClickedSyncplayer);
-    connect(ui->m_gotoPos, &QToolButton::clicked, this, &CInfoBar::OnBnClickedGotoPosition);
-    connect(ui->m_muteBtn, &QToolButton::clicked, this, &CInfoBar::OnBnClickedMuteAudio);
-    connect(ui->m_vrBtn, &QToolButton::clicked, this, &CInfoBar::OnBnClickedEnableVR);
-
-    connect(this, &CInfoBar::ActionTriggered, MainWindow::instance()->GetActionManager(), &ActionManager::ActionTriggered);
-
-    connect(ui->m_physicsBtn, &QAbstractButton::toggled, ui->m_physicsBtn, [this](bool checked) {
-        ui->m_physicsBtn->setToolTip(checked ? tr("Stop Simulation (Ctrl+P)") : tr("Simulate (Ctrl+P)"));
-    });
-    connect(ui->m_physSingleStepBtn, &QAbstractButton::toggled, ui->m_physSingleStepBtn, [this](bool checked) {
-        ui->m_physSingleStepBtn->setToolTip(checked ? tr("Disable Physics/AI Single-step Mode ('<' in Game Mode)") : tr("Enable Physics/AI Single-step Mode ('<' in Game Mode)"));
-    });
-    connect(ui->m_syncPlayerBtn, &QAbstractButton::toggled, ui->m_syncPlayerBtn, [this](bool checked) {
-        ui->m_syncPlayerBtn->setToolTip(checked ? tr("Synchronize Player with Camera") : tr("Move Player and Camera Separately"));
-    });
-    connect(ui->m_muteBtn, &QAbstractButton::toggled, ui->m_muteBtn, [this](bool checked) {
-        ui->m_muteBtn->setToolTip(checked ? tr("Un-mute Audio") : tr("Mute Audio"));
-    });
-    connect(ui->m_vrBtn, &QAbstractButton::toggled, ui->m_vrBtn, [this](bool checked) {
-        ui->m_vrBtn->setToolTip(checked ? tr("Disable VR Preview") : tr("Enable VR Preview"));
-    });
-
-    ui->m_moveSpeed->setValidator(new QDoubleValidator(m_minSpeed, m_maxSpeed, m_numDecimals, ui->m_moveSpeed));
-
-    // Save off the move speed here since setting up the combo box can cause it to update values in the background.
-    float cameraMoveSpeed = gSettings.cameraMoveSpeed;
-
-    // Populate the presets in the ComboBox
-    for (float presetValue : m_speedPresetValues)
-    {
-        ui->m_moveSpeed->addItem(QString().setNum(presetValue, 'f', m_numDecimals), presetValue);
-    }
-
-    SetSpeedComboBox(cameraMoveSpeed);
-
-    ui->m_moveSpeed->setInsertPolicy(QComboBox::NoInsert);
-
-    using namespace AzToolsFramework::ComponentModeFramework;
-    EditorComponentModeNotificationBus::Handler::BusConnect(AzToolsFramework::GetEntityContextId());
-}
-
-//////////////////////////////////////////////////////////////////////////
-CInfoBar::~CInfoBar()
-{
-    using namespace AzToolsFramework::ComponentModeFramework;
-    EditorComponentModeNotificationBus::Handler::BusDisconnect();
-
-    GetIEditor()->UnregisterNotifyListener(this);
-
-    AZ::VR::VREventBus::Handler::BusDisconnect();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CInfoBar::OnEditorNotifyEvent(EEditorNotifyEvent event)
-{
-    if (event == eNotify_OnIdleUpdate)
-    {
-        IdleUpdate();
-    }
-    else if (event == eNotify_OnBeginGameMode || event == eNotify_OnEndGameMode)
-    {
-        // Audio: determine muted state of audio
-        //m_bMuted = gEnv->pAudioSystem->GetMainVolume() == 0.f;
-        ui->m_muteBtn->setChecked(gSettings.bMuteAudio);
-    }
-    else if (event == eNotify_OnBeginLoad || event == eNotify_OnCloseScene)
-    {
-        // make sure AI/Physics is disabled on level load (CE-4229)
-        if (GetIEditor()->GetGameEngine()->GetSimulationMode())
-        {
-            OnBnClickedPhysics();
-        }
-
-        ui->m_physicsBtn->setEnabled(false);
-        ui->m_physSingleStepBtn->setEnabled(false);
-        ui->m_physDoStepBtn->setEnabled(false);
-    }
-    else if (event == eNotify_OnEndLoad || event == eNotify_OnEndNewScene)
-    {
-        ui->m_physicsBtn->setEnabled(true);
-        ui->m_physSingleStepBtn->setEnabled(true);
-        ui->m_physDoStepBtn->setEnabled(true);
-    }
-    else if (event == eNotify_OnSelectionChange)
-    {
-        m_bSelectionChanged = true;
-    }
-}
-
-void CInfoBar::IdleUpdate()
-{
-    if (!m_idleUpdateEnabled)
-    {
-        return;
-    }
-
-    bool updateUI = false;
-    // Update Width/Height of selection rectangle.
-    AABB box;
-    GetIEditor()->GetSelectedRegion(box);
-    float width = box.max.x - box.min.x;
-    float height = box.max.y - box.min.y;
-    if (m_width != width || m_height != height)
-    {
-        m_width = width;
-        m_height = height;
-        updateUI = true;
-    }
-
-    Vec3 marker = GetIEditor()->GetMarkerPosition();
-
-    int selectedEntitiesCount = 0;
-    AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(
-        selectedEntitiesCount, &AzToolsFramework::ToolsApplicationRequests::GetSelectedEntitiesCount);
-    if (selectedEntitiesCount != m_numSelected)
-    {
-        m_numSelected = selectedEntitiesCount;
-        updateUI = true;
-    }
-
-    QString str;
-    if (updateUI)
-    {
-        if (m_numSelected == 0)
-        {
-            str = tr("None Selected");
-        }
-        else if (m_numSelected == 1)
-        {
-            str = tr("1 Object Selected");
-        }
-        else
-        {
-            str = tr("%1 Objects Selected").arg(m_numSelected);
-        }
-
-        ui->m_statusText->setText(str);
-        m_sLastText = str;
-    }
-
-    if (gSettings.cameraMoveSpeed != m_prevMoveSpeed &&
-        !ui->m_moveSpeed->lineEdit()->hasFocus())
-    {
-        m_prevMoveSpeed = gSettings.cameraMoveSpeed;
-        SetSpeedComboBox(gSettings.cameraMoveSpeed);
-    }
-
-    {
-        bool bPhysics = GetIEditor()->GetGameEngine()->GetSimulationMode();
-        if ((ui->m_physicsBtn->isChecked() && !bPhysics) ||
-            (!ui->m_physicsBtn->isChecked() && bPhysics))
-        {
-            ui->m_physicsBtn->setChecked(bPhysics);
-        }
-
-        // Unsupported for Phyics:: atm
-        bool bSingleStep = false;
-        if (ui->m_physSingleStepBtn->isChecked() != bSingleStep)
-        {
-            ui->m_physSingleStepBtn->setChecked(bSingleStep);
-        }
-
-        bool bSyncPlayer = GetIEditor()->GetGameEngine()->IsSyncPlayerPosition();
-        if ((!ui->m_syncPlayerBtn->isChecked() && !bSyncPlayer) ||
-            (ui->m_syncPlayerBtn->isChecked() && bSyncPlayer))
-        {
-            ui->m_syncPlayerBtn->setChecked(!bSyncPlayer);
-        }
-    }
-
-    // if our selection changed, or if our display values are out of date
-    if (m_bSelectionChanged)
-    {
-        m_bSelectionChanged = false;
-    }
-}
-
-inline double Round(double fVal, double fStep)
-{
-    if (fStep > 0.f)
-    {
-        fVal = int_round(fVal / fStep) * fStep;
-    }
-    return fVal;
-}
-
-void CInfoBar::OnUpdateMoveSpeedText(const QString& text)
-{
-    gSettings.cameraMoveSpeed = aznumeric_cast<float>(Round(text.toDouble(), m_speedStep));
-}
-
-void CInfoBar::OnSpeedComboBoxEnter()
-{
-    ui->m_moveSpeed->clearFocus();
-}
-
-void CInfoBar::OnInitDialog()
-{
-    QFontMetrics metrics({});
-    int width = metrics.boundingRect("-9999.99").width() * m_fieldWidthMultiplier;
-
-    ui->m_moveSpeed->setFixedWidth(width);
-
-    ui->m_physicsBtn->setEnabled(false);
-    ui->m_physSingleStepBtn->setEnabled(false);
-    ui->m_physDoStepBtn->setEnabled(false);
-    
-    ui->m_muteBtn->setChecked(gSettings.bMuteAudio);
-    Audio::AudioSystemRequestBus::Broadcast(&Audio::AudioSystemRequestBus::Events::PushRequest, gSettings.bMuteAudio ? m_oMuteAudioRequest : m_oUnmuteAudioRequest);
-
-    //This is here just in case this class hasn't been created before
-    //a VR headset was initialized
-    ui->m_vrBtn->setEnabled(false);
-    if (AZ::VR::HMDDeviceRequestBus::GetTotalNumOfEventHandlers() != 0)
-    {
-        ui->m_vrBtn->setEnabled(true);
-    }
-
-    AZ::VR::VREventBus::Handler::BusConnect();
-}
-
-void CInfoBar::OnHMDInitialized()
-{
-    ui->m_vrBtn->setEnabled(true);
-}
-
-void CInfoBar::OnHMDShutdown()
-{
-    ui->m_vrBtn->setEnabled(false);
-}
-
-void CInfoBar::OnBnClickedTerrainCollision()
-{
-    emit ActionTriggered(ID_TERRAIN_COLLISION);
-}
-
-void CInfoBar::OnBnClickedPhysics()
-{
-    if (!ui->m_physicsBtn->isEnabled())
-    {
-        return;
-    }
-
-    bool bPhysics = GetIEditor()->GetGameEngine()->GetSimulationMode();
-    ui->m_physicsBtn->setChecked(bPhysics);
-    emit ActionTriggered(ID_SWITCH_PHYSICS);
-
-    if (bPhysics && ui->m_physSingleStepBtn->isChecked())
-    {
-        OnBnClickedSingleStepPhys();
-    }
-}
-
-void CInfoBar::OnBnClickedSingleStepPhys()
-{
-}
-
-void CInfoBar::OnBnClickedDoStepPhys()
-{
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CInfoBar::OnBnClickedSyncplayer()
-{
-    emit ActionTriggered(ID_GAME_SYNCPLAYER);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CInfoBar::OnBnClickedGotoPosition()
-{
-    emit ActionTriggered(ID_DISPLAY_GOTOPOSITION);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CInfoBar::OnBnClickedMuteAudio()
-{
-    gSettings.bMuteAudio = !gSettings.bMuteAudio;
-
-    Audio::AudioSystemRequestBus::Broadcast(&Audio::AudioSystemRequestBus::Events::PushRequest, gSettings.bMuteAudio ? m_oMuteAudioRequest : m_oUnmuteAudioRequest);
-
-    ui->m_muteBtn->setChecked(gSettings.bMuteAudio);
-}
-
-void CInfoBar::OnBnClickedEnableVR()
-{
-    gSettings.bEnableGameModeVR = !gSettings.bEnableGameModeVR;
-    ui->m_vrBtn->setChecked(gSettings.bEnableGameModeVR);
-}
-
-void CInfoBar::EnteredComponentMode(const AZStd::vector<AZ::Uuid>& /*componentModeTypes*/)
-{
-    ui->m_physicsBtn->setDisabled(true);
-}
-
-void CInfoBar::LeftComponentMode(const AZStd::vector<AZ::Uuid>& /*componentModeTypes*/)
-{
-    ui->m_physicsBtn->setEnabled(true);
-}
-
-void CInfoBar::SetSpeedComboBox(double value)
-{
-    value = AZStd::clamp(Round(value, m_speedStep), m_minSpeed, m_maxSpeed);
-
-    int index = ui->m_moveSpeed->findData(value);
-    if (index != -1)
-    {
-        ui->m_moveSpeed->setCurrentIndex(index);
-    }
-    else
-    {
-        ui->m_moveSpeed->lineEdit()->setText(QString().setNum(value, 'f', m_numDecimals));
-    }
-}
-
-#include <moc_InfoBar.cpp>
diff --git a/Code/Sandbox/Editor/InfoBar.h b/Code/Sandbox/Editor/InfoBar.h
deleted file mode 100644
index 6e547d46c6..0000000000
--- a/Code/Sandbox/Editor/InfoBar.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_EDITOR_INFOBAR_H
-#define CRYINCLUDE_EDITOR_INFOBAR_H
-
-#pragma once
-// InfoBar.h : header file
-//
-
-#if !defined(Q_MOC_RUN)
-#include <AzToolsFramework/ComponentMode/EditorComponentModeBus.h>
-#include <IAudioSystem.h>
-#include <HMDBus.h>
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-// CInfoBar dialog
-
-namespace Ui {
-    class CInfoBar;
-}
-
-class CInfoBar
-    : public QWidget
-    , public IEditorNotifyListener
-    , public AZ::VR::VREventBus::Handler
-    , private AzToolsFramework::ComponentModeFramework::EditorComponentModeNotificationBus::Handler
-{
-    Q_OBJECT
-
-    // Construction
-public:
-    CInfoBar(QWidget* parent = nullptr);
-    ~CInfoBar();
-
-    // Toggle the mute audio button
-    void ToggleAudio() { OnBnClickedMuteAudio(); }
-    void SetSpeedComboBox(double value);
-
-Q_SIGNALS:
-    void ActionTriggered(int command);
-
-    // Implementation
-protected:
-    void IdleUpdate();
-    virtual void OnEditorNotifyEvent(EEditorNotifyEvent event);
-
-    virtual void OnOK() {};
-    virtual void OnCancel() {};
-
-    void OnBnClickedSyncplayer();
-    void OnBnClickedGotoPosition();
-
-    void OnSpeedComboBoxEnter();
-    void OnUpdateMoveSpeedText(const QString&);
-    void OnBnClickedTerrainCollision();
-    void OnBnClickedPhysics();
-    void OnBnClickedSingleStepPhys();
-    void OnBnClickedDoStepPhys();
-    void OnBnClickedMuteAudio();
-    void OnBnClickedEnableVR();
-    void OnInitDialog();
-
-    //////////////////////////////////////////////////////////////////////////
-    /// VR Event Bus Implementation
-    //////////////////////////////////////////////////////////////////////////
-    void OnHMDInitialized() override;
-    void OnHMDShutdown() override;
-    //////////////////////////////////////////////////////////////////////////
-
-    // EditorComponentModeNotificationBus
-    void EnteredComponentMode(const AZStd::vector<AZ::Uuid>& componentModeTypes) override;
-    void LeftComponentMode(const AZStd::vector<AZ::Uuid>& componentModeTypes) override;
-
-    float m_width, m_height;
-    //int m_heightMapX,m_heightMapY;
-    double m_fieldWidthMultiplier = 1.8;
-
-    int m_numSelected;
-    float m_prevMoveSpeed;
-
-    // Speed combobox/lineEdit settings
-    double m_minSpeed = 0.1;
-    double m_maxSpeed = 100.0;
-    double m_speedStep = 0.1;
-    int m_numDecimals = 1;
-
-    // Speed presets
-    float m_speedPresetValues[3] = { 0.1f, 1.0f, 10.0f };
-
-    bool m_bSelectionChanged;
-
-    bool m_bDragMode;
-    QString m_sLastText;
-
-    Vec3 m_lastValue;
-    Vec3 m_currValue;
-    float m_oldMainVolume;
-
-    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::CInfoBar> ui;
-
-    bool m_idleUpdateEnabled = true;
-};
-
-#endif // CRYINCLUDE_EDITOR_INFOBAR_H
diff --git a/Code/Sandbox/Editor/InfoBar.ui b/Code/Sandbox/Editor/InfoBar.ui
deleted file mode 100644
index 84207629df..0000000000
--- a/Code/Sandbox/Editor/InfoBar.ui
+++ /dev/null
@@ -1,333 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>CInfoBar</class>
- <widget class="QWidget" name="CInfoBar">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>1600</width>
-    <height>27</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="autoFillBackground">
-   <bool>true</bool>
-  </property>
-  <property name="styleSheet">
-   <string notr="true">b</string>
-  </property>
-  <layout class="QHBoxLayout" name="horizontalLayout" stretch="0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0">
-   <property name="spacing">
-    <number>0</number>
-   </property>
-   <property name="sizeConstraint">
-    <enum>QLayout::SetFixedSize</enum>
-   </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="QLabel" name="m_statusText">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string>No Objects Selected</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QToolButton" name="m_gotoPos">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="toolTip">
-      <string>Go to Position</string>
-     </property>
-     <property name="text">
-      <string>Go to Position</string>
-     </property>
-     <property name="icon">
-      <iconset resource="InfoBar.qrc">
-       <normaloff>:/InfoBar/GotoLocation-default.svg</normaloff>:/InfoBar/GotoLocation-default.svg</iconset>
-     </property>
-     <property name="iconSize">
-      <size>
-       <width>22</width>
-       <height>18</height>
-      </size>
-     </property>
-    </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>1</width>
-       <height>18</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item>
-    <widget class="QLabel" name="label_5">
-     <property name="text">
-      <string>Speed</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QComboBox" name="m_moveSpeed">
-     <property name="toolTip">
-      <string>Camera Movement Speed</string>
-     </property>
-     <property name="editable">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QToolButton" name="m_syncPlayerBtn">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="toolTip">
-      <string>Synchronize Player with Camera</string>
-     </property>
-     <property name="text">
-      <string>Synchronize Player with Camera</string>
-     </property>
-     <property name="icon">
-      <iconset resource="InfoBar.qrc">
-       <normaloff>:/InfoBar/NoPlayerSync-default.svg</normaloff>
-       <activeon>:/InfoBar/NoPlayerSync-selected.svg</activeon>
-       :/InfoBar/NoPlayerSync-default.svg</iconset>
-     </property>
-     <property name="iconSize">
-      <size>
-       <width>18</width>
-       <height>18</height>
-      </size>
-     </property>
-     <property name="checkable">
-      <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>1</width>
-       <height>18</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item>
-    <widget class="QToolButton" name="m_physicsBtn">
-     <property name="toolTip">
-      <string>Simulate (Ctrl+P)</string>
-     </property>
-     <property name="text">
-      <string>Simulate (Ctrl+P)</string>
-     </property>
-     <property name="icon">
-      <iconset resource="InfoBar.qrc">
-       <normaloff>:/InfoBar/PhysicsCol-default.svg</normaloff>:/InfoBar/PhysicsCol-default.svg</iconset>
-     </property>
-     <property name="iconSize">
-      <size>
-       <width>18</width>
-       <height>18</height>
-      </size>
-     </property>
-     <property name="checkable">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QToolButton" name="m_physSingleStepBtn">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="toolTip">
-      <string>Enable Physics/AI Single-step Mode ('&lt;' in Game Mode)</string>
-     </property>
-     <property name="text">
-      <string>Enable Physics/AI Single-step Mode ('&lt;' in Game Mode)</string>
-     </property>
-     <property name="icon">
-      <iconset resource="InfoBar.qrc">
-       <normaloff>:/InfoBar/Pause-default.svg</normaloff>:/InfoBar/Pause-default.svg</iconset>
-     </property>
-     <property name="iconSize">
-      <size>
-       <width>18</width>
-       <height>18</height>
-      </size>
-     </property>
-     <property name="checkable">
-      <bool>true</bool>
-     </property>
-     <property name="visible">
-       <bool>false</bool>
-    </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QToolButton" name="m_physDoStepBtn">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="toolTip">
-      <string>Perform a Single Physics/AI Simulation Step ('&gt;' in Game Mode)</string>
-     </property>
-     <property name="text">
-      <string>Perform a Single Physics/AI Simulation Step ('&gt;' in Game Mode)</string>
-     </property>
-     <property name="icon">
-      <iconset resource="InfoBar.qrc">
-       <normaloff>:/InfoBar/PausePlay-default.svg</normaloff>:/InfoBar/PausePlay-default.svg</iconset>
-     </property>
-     <property name="iconSize">
-      <size>
-       <width>18</width>
-       <height>18</height>
-      </size>
-     </property>
-     <property name="visible">
-       <bool>false</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>1</width>
-       <height>18</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item>
-    <widget class="QToolButton" name="m_muteBtn">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="toolTip">
-      <string>Mute Audio</string>
-     </property>
-     <property name="text">
-      <string>Mute Audio</string>
-     </property>
-     <property name="icon">
-      <iconset resource="InfoBar.qrc">
-       <normaloff>:/InfoBar/Mute-default.svg</normaloff>:/InfoBar/Mute-default.svg</iconset>
-     </property>
-     <property name="iconSize">
-      <size>
-       <width>18</width>
-       <height>18</height>
-      </size>
-     </property>
-     <property name="checkable">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QToolButton" name="m_vrBtn">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="toolTip">
-      <string>Enable VR Preview</string>
-     </property>
-     <property name="text">
-      <string>Enable VR Preview</string>
-     </property>
-     <property name="icon">
-      <iconset resource="InfoBar.qrc">
-       <normaloff>:/InfoBar/VR-default.svg</normaloff>:/InfoBar/VR-default.svg</iconset>
-     </property>
-     <property name="iconSize">
-      <size>
-       <width>18</width>
-       <height>18</height>
-      </size>
-     </property>
-     <property name="checkable">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources>
-  <include location="InfoBar.qrc"/>
- </resources>
- <connections/>
-</ui>
diff --git a/Code/Sandbox/Editor/LayoutWnd.cpp b/Code/Sandbox/Editor/LayoutWnd.cpp
index 54389f30c1..1de4d9584a 100644
--- a/Code/Sandbox/Editor/LayoutWnd.cpp
+++ b/Code/Sandbox/Editor/LayoutWnd.cpp
@@ -94,134 +94,12 @@ void CLayoutSplitter::CreateLayoutView(int row, int col, int id)
     viewPane->SetId(id);
 }
 
-//////////////////////////////////////////////////////////////////////////
-// InfoBarExpanderWatcher
-//////////////////////////////////////////////////////////////////////////
-
-class InfoBarExpanderWatcher
-    : public QObject
-{
-public:
-    InfoBarExpanderWatcher(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());
-
-                    auto toolWidgets = toolbar->findChildren<QWidget*>();
-
-                    if (toolWidgets.count() > 0)
-                    {
-                        for (auto toolWidget : toolWidgets)
-                        {
-                            if (AzQtComponents::Style::hasClass(toolWidget, "expanderMenu_hide"))
-                            {
-                                continue;
-                            }
-
-                            if (auto toolButton = qobject_cast<QToolButton*>(toolWidget))
-                            {
-                                if (!toolButton->isVisible())
-                                {
-                                    // Skip some empty buttons
-                                    if (toolButton->text().isEmpty())
-                                    {
-                                        continue;
-                                    }
-
-                                    QString plainText = QTextDocumentFragment::fromHtml(toolButton->text()).toPlainText();
-                                    QAction* action = new QAction(plainText, menu);
-
-                                    if (!toolButton->isEnabled())
-                                    {
-                                        action->setEnabled(false);
-                                    }
-
-                                    connect(action, &QAction::triggered, toolButton, &QToolButton::clicked);
-
-                                    if (toolButton->isCheckable())
-                                    {
-                                        action->setCheckable(true);
-                                    }
-
-                                    action->setChecked(toolButton->isChecked());
-
-                                    menu->addAction(action);
-                                }
-                            }
-                            else if (auto toolCombo = qobject_cast<QComboBox*>(toolWidget))
-                            {
-                                // Add custom menu for Speed
-                                if (toolCombo->objectName() == "m_moveSpeed")
-                                {
-                                    double currentValue = toolCombo->lineEdit()->text().toDouble();
-
-                                    QMenu* newMenu = menu->addMenu(QString("Speed: %1").arg(currentValue));
-
-                                    double presets[] = { 0.1, 1.0, 10.0 };
-                                    for (double preset : presets)
-                                    {
-                                        QAction* presetAction = new QAction(newMenu);
-                                        presetAction->setText(QString::number(preset));
-
-                                        connect(presetAction, &QAction::triggered, this, [preset, this]() {
-                                            if (m_infoBar)
-                                            {
-                                                m_infoBar->SetSpeedComboBox(preset);
-                                            }
-                                        });
-
-                                        newMenu->addAction(presetAction);
-                                    }
-                                }
-                            }
-                        }
-                    }
-
-                    menu->exec(mouseEvent->globalPos());
-                    return true;
-                }
-
-                break;
-            }
-        }
-
-        return QObject::eventFilter(obj, event);
-    }
-
-    void SetInfoBar(CInfoBar* infoBar)
-    {
-        m_infoBar = infoBar;
-    }
-
-private:
-    CInfoBar* m_infoBar = nullptr;
-};
-
 //////////////////////////////////////////////////////////////////////////
 // CLayoutWnd
 //////////////////////////////////////////////////////////////////////////
 CLayoutWnd::CLayoutWnd(QSettings* settings, QWidget* parent)
     : AzQtComponents::ToolBarArea(parent)
     , m_settings(settings)
-    , m_expanderWatcher(new InfoBarExpanderWatcher(this))
 {
     m_bMaximized = false;
     m_maximizedView = 0;
@@ -230,23 +108,8 @@ CLayoutWnd::CLayoutWnd(QSettings* settings, QWidget* parent)
     m_maximizedViewId = 0;
     m_infoBarSize = QSize(0, 0);
 
-    m_infoBar = new CInfoBar(this);
     connect(qApp, &QApplication::focusChanged, this, &CLayoutWnd::OnFocusChanged);
 
-    m_expanderWatcher->SetInfoBar(m_infoBar);
-
-    m_infoToolBar = CreateToolBarFromWidget(m_infoBar,
-                                            Qt::BottomToolBarArea,
-                                            QStringLiteral("Info Panel"));
-    m_infoToolBar->setMovable(false);
-    m_infoToolBar->setObjectName("InfoBar");
-    AzQtComponents::Style::addClass(m_infoToolBar, "DefaultSpacing");
-
-    if (QToolButton* expansion = AzQtComponents::ToolBar::getToolBarExpansionButton(m_infoToolBar))
-    {
-        expansion->installEventFilter(m_expanderWatcher);
-    }
-
     setContextMenuPolicy(Qt::NoContextMenu);
 }
 
@@ -415,7 +278,6 @@ void CLayoutWnd::CreateLayout(EViewLayout layout, bool bBindViewports, EViewport
     }
 
     QRect rcView = rect();
-    rcView.setBottom(rcView.bottom() - m_infoBar->height());
 
     // Ensure we delete our old view immediately so it can relinquish its backing ViewportContext
     if (m_maximizedView)
diff --git a/Code/Sandbox/Editor/LayoutWnd.h b/Code/Sandbox/Editor/LayoutWnd.h
index 87240cbf76..2af56f907c 100644
--- a/Code/Sandbox/Editor/LayoutWnd.h
+++ b/Code/Sandbox/Editor/LayoutWnd.h
@@ -20,7 +20,6 @@
 
 #if !defined(Q_MOC_RUN)
 #include "Viewport.h"
-#include "InfoBar.h"
 
 #include <QSplitter>
 #include <QPointer>
@@ -77,8 +76,6 @@ private:
     friend class CLayoutWnd;
 };
 
-class InfoBarExpanderWatcher;
-
 /** Main layout window.
 */
 class CLayoutWnd
@@ -116,8 +113,6 @@ public:
     //! Switch 2D viewports.
     void Cycle2DViewport();
 
-    CInfoBar& GetInfoBar() { return *m_infoBar; }
-
 public slots:
     void ResetLayout();
 
@@ -162,11 +157,8 @@ private:
     // Id of maximized view pane.
     int m_maximizedViewId;
 
-    CInfoBar* m_infoBar;
-    QToolBar* m_infoToolBar;
     QSize m_infoBarSize;
     QSettings* m_settings;
-    InfoBarExpanderWatcher* m_expanderWatcher;
 };
 
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Code/Sandbox/Editor/MainWindow.cpp b/Code/Sandbox/Editor/MainWindow.cpp
index 9e983c3593..3753c29064 100644
--- a/Code/Sandbox/Editor/MainWindow.cpp
+++ b/Code/Sandbox/Editor/MainWindow.cpp
@@ -297,68 +297,6 @@ namespace
     }
 }
 
-class SnapToWidget
-    : public QWidget
-{
-public:
-    typedef AZStd::function<void(double)> SetValueCallback;
-    typedef AZStd::function<double()> GetValueCallback;
-
-    SnapToWidget(QAction* defaultAction, SetValueCallback setValueCallback, GetValueCallback getValueCallback)
-        : m_setValueCallback(setValueCallback)
-        , m_getValueCallback(getValueCallback)
-    {
-        QHBoxLayout* layout = new QHBoxLayout();
-        setLayout(layout);
-
-        m_toolButton = new QToolButton();
-        m_toolButton->setAutoRaise(true);
-        m_toolButton->setCheckable(false);
-        m_toolButton->setDefaultAction(defaultAction);
-
-        m_spinBox = new AzQtComponents::DoubleSpinBox();
-
-        layout->addWidget(m_toolButton);
-        layout->addWidget(m_spinBox);
-
-        m_spinBox->setEnabled(defaultAction->isChecked());
-        m_spinBox->setMinimum(1e-2f);
-
-        {
-            QSignalBlocker signalBlocker(m_spinBox);
-            m_spinBox->setValue(m_getValueCallback());
-        }
-
-        QObject::connect(m_spinBox, QOverload<double>::of(&AzQtComponents::DoubleSpinBox::valueChanged), this, &SnapToWidget::OnValueChanged);
-        QObject::connect(defaultAction, &QAction::changed, this, &SnapToWidget::OnActionChanged);
-    }
-
-    void SetIcon(QIcon icon)
-    {
-        m_toolButton->setIcon(icon);
-    }
-
-protected:
-
-    void OnValueChanged(double value)
-    {
-        m_setValueCallback(value);
-    }
-
-    void OnActionChanged()
-    {
-        m_spinBox->setEnabled(m_toolButton->isChecked());
-    }
-
-private:
-
-    QToolButton* m_toolButton = nullptr;
-    AzQtComponents::DoubleSpinBox* m_spinBox = nullptr;
-
-    SetValueCallback m_setValueCallback;
-    GetValueCallback m_getValueCallback;
-};
-
 /////////////////////////////////////////////////////////////////////////////
 // MainWindow
 /////////////////////////////////////////////////////////////////////////////
@@ -532,9 +470,11 @@ void MainWindow::Initialize()
 
     InitToolActionHandlers();
 
+    // Initialize toolbars before we setup the menu so that any tools can be added to the toolbar as needed
+    InitToolBars();
+
     m_levelEditorMenuHandler->Initialize();
 
-    InitToolBars();
     InitStatusBar();
 
     AzToolsFramework::SourceControlNotificationBus::Handler::BusConnect();
@@ -1274,36 +1214,6 @@ void UndoRedoToolButton::Update(int count)
     setEnabled(count > 0);
 }
 
-QWidget* MainWindow::CreateSnapToGridWidget()
-{
-    SnapToWidget::SetValueCallback setCallback = [](double snapStep)
-    {
-        SandboxEditor::SetGridSnappingSize(snapStep);
-    };
-
-    SnapToWidget::GetValueCallback getCallback = []()
-    {
-        return SandboxEditor::GridSnappingSize();
-    };
-
-    return new SnapToWidget(m_actionManager->GetAction(ID_SNAP_TO_GRID), setCallback, getCallback);
-}
-
-QWidget* MainWindow::CreateSnapToAngleWidget()
-{
-    SnapToWidget::SetValueCallback setCallback = [](double snapAngle)
-    {
-        SandboxEditor::SetAngleSnappingSize(snapAngle);
-    };
-
-    SnapToWidget::GetValueCallback getCallback = []()
-    {
-        return SandboxEditor::AngleSnappingSize();
-    };
-
-    return new SnapToWidget(m_actionManager->GetAction(ID_SNAPANGLE), setCallback, getCallback);
-}
-
 bool MainWindow::IsPreview() const
 {
     return GetIEditor()->IsInPreviewMode();
@@ -2016,12 +1926,6 @@ QWidget* MainWindow::CreateToolbarWidget(int actionId)
     case ID_TOOLBAR_WIDGET_REDO:
         w = CreateUndoRedoButton(ID_REDO);
         break;
-    case ID_TOOLBAR_WIDGET_SNAP_GRID:
-        w = CreateSnapToGridWidget();
-        break;
-    case ID_TOOLBAR_WIDGET_SNAP_ANGLE:
-        w = CreateSnapToAngleWidget();
-        break;
     case ID_TOOLBAR_WIDGET_SPACER_RIGHT:
         w = CreateSpacerRightWidget();
         break; 
diff --git a/Code/Sandbox/Editor/MainWindow.h b/Code/Sandbox/Editor/MainWindow.h
index ab60b0e0d4..43600b039e 100644
--- a/Code/Sandbox/Editor/MainWindow.h
+++ b/Code/Sandbox/Editor/MainWindow.h
@@ -202,8 +202,6 @@ private:
     // AzToolsFramework::SourceControlNotificationBus::Handler:
     void ConnectivityStateChanged(const AzToolsFramework::SourceControlState state) override;
 
-    QWidget* CreateSnapToGridWidget();
-    QWidget* CreateSnapToAngleWidget();
     QWidget* CreateSpacerRightWidget();
 
     QToolButton* CreateUndoRedoButton(int command);
diff --git a/Code/Sandbox/Editor/Style/Editor.qss b/Code/Sandbox/Editor/Style/Editor.qss
index fa7d67dd43..2e96c73f35 100644
--- a/Code/Sandbox/Editor/Style/Editor.qss
+++ b/Code/Sandbox/Editor/Style/Editor.qss
@@ -144,20 +144,6 @@ EditorWindow QToolBar
     border-bottom: 2px solid #111111;
 }
 
-/* InfoBar (Toolbar below the main viewport) */
-
-QToolBar#InfoBar
-{
-    qproperty-iconSize: 22px 18px;
-}
-
-QToolBar#InfoBar AzQtComponents--VectorElement[Coordinate="X"] QLabel,
-QToolBar#InfoBar AzQtComponents--VectorElement[Coordinate="Y"] QLabel,
-QToolBar#InfoBar AzQtComponents--VectorElement[Coordinate="Z"] QLabel
-{
-    background-color: #333333;
-}
-
 DockWidgetTitleBar #DockWidgetContextMenu
 {
     qproperty-icon: url(:/Cards/img/UI20/Cards/menu_ico.svg);
diff --git a/Code/Sandbox/Editor/ToolbarManager.cpp b/Code/Sandbox/Editor/ToolbarManager.cpp
index 391eabae33..137057a4fa 100644
--- a/Code/Sandbox/Editor/ToolbarManager.cpp
+++ b/Code/Sandbox/Editor/ToolbarManager.cpp
@@ -582,19 +582,6 @@ AmazonToolbar ToolbarManager::GetEditModeToolbar() const
 {
     AmazonToolbar t = AmazonToolbar("EditMode", QObject::tr("Edit Mode Toolbar"));
     t.SetMainToolbar(true);
-    t.AddAction(ID_TOOLBAR_WIDGET_UNDO, ORIGINAL_TOOLBAR_VERSION);
-    t.AddAction(ID_TOOLBAR_WIDGET_REDO, ORIGINAL_TOOLBAR_VERSION);
-
-    t.AddAction(ID_TOOLBAR_SEPARATOR, ORIGINAL_TOOLBAR_VERSION);
-
-    t.AddAction(ID_EDITMODE_MOVE, ORIGINAL_TOOLBAR_VERSION);
-    t.AddAction(ID_EDITMODE_ROTATE, ORIGINAL_TOOLBAR_VERSION);
-    t.AddAction(ID_EDITMODE_SCALE, ORIGINAL_TOOLBAR_VERSION);
-
-    t.AddAction(ID_TOOLBAR_SEPARATOR, ORIGINAL_TOOLBAR_VERSION);
-    t.AddAction(ID_TOOLBAR_WIDGET_SNAP_GRID, ORIGINAL_TOOLBAR_VERSION);
-    t.AddAction(ID_TOOLBAR_WIDGET_SNAP_ANGLE, ORIGINAL_TOOLBAR_VERSION);
-
     return t;
 }
 
@@ -636,6 +623,20 @@ AmazonToolbar ToolbarManager::GetMiscToolbar() const
     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)
diff --git a/Code/Sandbox/Editor/ToolbarManager.h b/Code/Sandbox/Editor/ToolbarManager.h
index 70228636f5..1867316d01 100644
--- a/Code/Sandbox/Editor/ToolbarManager.h
+++ b/Code/Sandbox/Editor/ToolbarManager.h
@@ -169,6 +169,8 @@ public:
     AmazonToolbar GetMiscToolbar() const;
     AmazonToolbar GetPlayConsoleToolbar() const;
 
+    void AddButtonToEditToolbar(QAction* action);
+
 private:
     Q_DISABLE_COPY(ToolbarManager);
     void SaveToolbars();
diff --git a/Code/Sandbox/Editor/ViewportTitleDlg.cpp b/Code/Sandbox/Editor/ViewportTitleDlg.cpp
index 5ccb83cd5b..f85aa1f06d 100644
--- a/Code/Sandbox/Editor/ViewportTitleDlg.cpp
+++ b/Code/Sandbox/Editor/ViewportTitleDlg.cpp
@@ -21,6 +21,8 @@
 // Qt
 #include <QInputDialog>
 
+#include <AtomLyIntegration/AtomViewportDisplayInfo/AtomViewportInfoDisplayBus.h>
+
 // CryCommon
 #include <CryCommon/SFunctor.h>
 
@@ -35,16 +37,20 @@
 #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 <AtomLyIntegration/AtomViewportDisplayInfo/AtomViewportInfoDisplayBus.h>
-
+#include <AzCore/std/algorithm.h>
+#include <AzCore/Casting/numeric_cast.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
@@ -103,7 +109,9 @@ CViewportTitleDlg::CViewportTitleDlg(QWidget* pParent)
     layout->addWidget(container);
     container->setObjectName("ViewportTitleDlgContainer");
 
-    m_pViewPane = NULL;
+    m_prevMoveSpeed = 0;
+
+    m_pViewPane = nullptr;
     GetIEditor()->RegisterNotifyListener(this);
     GetISystem()->GetISystemEventDispatcher()->RegisterListener(this);
 
@@ -111,21 +119,176 @@ CViewportTitleDlg::CViewportTitleDlg(QWidget* pParent)
     LoadCustomPresets("AspectRatioPresets", "AspectRatioPreset", m_customAspectRatioPresets);
     LoadCustomPresets("ResPresets", "ResPreset", m_customResPresets);
 
-    OnInitDialog();
+    // audio request setup
+    m_oMuteAudioRequest.pData = &m_oMuteAudioRequestData;
+    m_oUnmuteAudioRequest.pData = &m_oUnmuteAudioRequestData;
 
-    connect(m_ui->m_fovLabel, &QWidget::customContextMenuRequested, this, &CViewportTitleDlg::PopUpFOVMenu);
-    connect(m_ui->m_fovStaticCtrl, &QWidget::customContextMenuRequested, this, &CViewportTitleDlg::PopUpFOVMenu);
-    connect(m_ui->m_ratioStaticCtrl, &QWidget::customContextMenuRequested, this, &CViewportTitleDlg::PopUpAspectMenu);
-    connect(m_ui->m_ratioLabel, &QWidget::customContextMenuRequested, this, &CViewportTitleDlg::PopUpAspectMenu);
-    connect(m_ui->m_sizeStaticCtrl, &QWidget::customContextMenuRequested, this, &CViewportTitleDlg::PopUpResolutionMenu);
+    SetupCameraDropdownMenu();
+    SetupResolutionDropdownMenu();
+    SetupViewportInformationMenu();
+    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);
+    m_syncPlayerToCameraAction = new QAction("Sync camera to player", cameraMenu);
+    m_syncPlayerToCameraAction->setCheckable(true);
+    connect(m_syncPlayerToCameraAction, &QAction::triggered, this, &CViewportTitleDlg::OnBnClickedSyncplayer);
+    cameraMenu->addAction(m_syncPlayerToCameraAction);
+
+    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));
+
+    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.
+    float cameraMoveSpeed = 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::NoInsert);
+    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::SetupOverflowMenu()
+{
+    // Setup the overflow menu
+    QMenu* overFlowMenu = new QMenu(this);
+    m_debugHelpersAction = new QAction("Debug Helpers", overFlowMenu);
+    m_debugHelpersAction->setCheckable(true);
+    m_debugHelpersAction->setChecked(Helpers::IsHelpersShown());
+    connect(m_debugHelpersAction, &QAction::triggered, this, &CViewportTitleDlg::OnToggleHelpers);
+    overFlowMenu->addAction(m_debugHelpersAction);
+
+    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);
+    auto gridSizeContainer = new QWidget(overFlowMenu);
+    auto gridSizeLabel = new QLabel(tr("Grid Size"), overFlowMenu);
+
+    m_gridSpinBox = new AzQtComponents::DoubleSpinBox();
+    m_gridSpinBox->setValue(SandboxEditor::GridSnappingSize());
+    m_gridSpinBox->setMinimum(1e-2f);
+
+    QObject::connect(
+        m_gridSpinBox, QOverload<double>::of(&AzQtComponents::DoubleSpinBox::valueChanged), this, &CViewportTitleDlg::OnGridSpinBoxChanged);
+
+    QHBoxLayout* gridSizeLayout = new QHBoxLayout;
+    gridSizeLayout->addWidget(gridSizeLabel);
+    gridSizeLayout->addWidget(m_gridSpinBox);
+    gridSizeContainer->setLayout(gridSizeLayout);
+    m_gridSizeActionWidget->setDefaultWidget(gridSizeContainer);
+    overFlowMenu->addAction(m_gridSizeActionWidget);
+
+    overFlowMenu->addSeparator();
+
+    m_enableAngleSnappingAction = new QAction("Enable Grid Snapping", overFlowMenu);
+    connect(m_enableAngleSnappingAction, &QAction::triggered, this, &CViewportTitleDlg::OnAngleSnappingToggled);
+    m_enableAngleSnappingAction->setCheckable(true);
+    overFlowMenu->addAction(m_enableAngleSnappingAction);
+
+    m_angleSizeActionWidget = new QWidgetAction(overFlowMenu);
+    auto angleSizeContainer = new QWidget(overFlowMenu);
+    auto angleSizeLabel = new QLabel(tr("Angle Snapping"), overFlowMenu);
+
+    m_angleSpinBox = new AzQtComponents::DoubleSpinBox();
+    m_angleSpinBox->setValue(SandboxEditor::AngleSnappingSize());
+    m_angleSpinBox->setMinimum(1e-2f);
+
+    QObject::connect(
+        m_angleSpinBox, QOverload<double>::of(&AzQtComponents::DoubleSpinBox::valueChanged), this,
+        &CViewportTitleDlg::OnAngleSpinBoxChanged);
+
+    QHBoxLayout* angleSizeLayout = new QHBoxLayout;
+    angleSizeLayout->addWidget(angleSizeLabel);
+    angleSizeLayout->addWidget(m_angleSpinBox);
+    angleSizeContainer->setLayout(angleSizeLayout);
+    m_angleSizeActionWidget->setDefaultWidget(angleSizeContainer);
+    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)
 {
@@ -140,21 +303,27 @@ void CViewportTitleDlg::SetViewPane(CLayoutViewPane* pViewPane)
 void CViewportTitleDlg::OnInitDialog()
 {
     m_ui->m_titleBtn->setText(m_title);
-    m_ui->m_sizeStaticCtrl->setText(QString());
-
-    m_ui->m_toggleHelpersBtn->setChecked(GetIEditor()->GetDisplaySettings()->IsDisplayHelpers());
-
 
     // 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();
 
-    connect(m_ui->m_toggleHelpersBtn, &QToolButton::clicked, this, &CViewportTitleDlg::OnToggleHelpers);
-    connect(m_ui->m_toggleDisplayInfoBtn, &QToolButton::clicked, this, &CViewportTitleDlg::OnToggleDisplayInfo);
+    // 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);
 
-    m_ui->m_toggleHelpersBtn->setProperty("class", "big");
-    m_ui->m_toggleDisplayInfoBtn->setProperty("class", "big");
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -177,6 +346,80 @@ void CViewportTitleDlg::OnMaximize()
 void CViewportTitleDlg::OnToggleHelpers()
 {
     Helpers::ToggleHelpers();
+    m_debugHelpersAction->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);
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -184,27 +427,12 @@ void CViewportTitleDlg::OnToggleDisplayInfo()
 {
     AZ::AtomBridge::ViewportInfoDisplayState state = AZ::AtomBridge::ViewportInfoDisplayState::NoInfo;
     AZ::AtomBridge::AtomViewportInfoDisplayRequestBus::BroadcastResult(
-        state,
-        &AZ::AtomBridge::AtomViewportInfoDisplayRequestBus::Events::GetDisplayState
-    );
+        state, &AZ::AtomBridge::AtomViewportInfoDisplayRequestBus::Events::GetDisplayState);
     state = aznumeric_cast<AZ::AtomBridge::ViewportInfoDisplayState>(
-        (aznumeric_cast<int>(state)+1) % aznumeric_cast<int>(AZ::AtomBridge::ViewportInfoDisplayState::Invalid));
+        (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::UpdateDisplayInfo()
-{
-    AZ::AtomBridge::ViewportInfoDisplayState state = AZ::AtomBridge::ViewportInfoDisplayState::NoInfo;
-    AZ::AtomBridge::AtomViewportInfoDisplayRequestBus::BroadcastResult(
-        state,
-        &AZ::AtomBridge::AtomViewportInfoDisplayRequestBus::Events::GetDisplayState
-    );
-    m_ui->m_toggleDisplayInfoBtn->setChecked(state != AZ::AtomBridge::ViewportInfoDisplayState::NoInfo);
+        &AZ::AtomBridge::AtomViewportInfoDisplayRequestBus::Events::SetDisplayState, state);
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -277,7 +505,7 @@ void CViewportTitleDlg::CreateFOVMenu()
 {
     if (!m_fovMenu)
     {
-        m_fovMenu = new QMenu(this);
+        m_fovMenu = new QMenu("FOV", this);
     }
 
     m_fovMenu->clear();
@@ -292,17 +520,6 @@ void CViewportTitleDlg::CreateFOVMenu()
     connect(action, &QAction::triggered, this, &CViewportTitleDlg::OnMenuFOVCustom);
 }
 
-void CViewportTitleDlg::PopUpFOVMenu()
-{
-    if (m_pViewPane == NULL)
-    {
-        return;
-    }
-
-    CreateFOVMenu();
-    m_fovMenu->exec(QCursor::pos());
-}
-
 QMenu* const CViewportTitleDlg::GetFovMenu()
 {
     CreateFOVMenu();
@@ -379,9 +596,9 @@ void CViewportTitleDlg::OnMenuAspectRatioCustom()
 //////////////////////////////////////////////////////////////////////////
 void CViewportTitleDlg::CreateAspectMenu()
 {
-    if (!m_aspectMenu)
+    if (m_aspectMenu == nullptr)
     {
-        m_aspectMenu = new QMenu(this);
+        m_aspectMenu = new QMenu("Aspect Ratio");
     }
 
     m_aspectMenu->clear();
@@ -396,23 +613,48 @@ void CViewportTitleDlg::CreateAspectMenu()
     connect(customAction, &QAction::triggered, this, &CViewportTitleDlg::OnMenuAspectRatioCustom);
 }
 
-void CViewportTitleDlg::PopUpAspectMenu()
-{
-    if (!m_pViewPane)
-    {
-        return;
-    }
-
-    CreateAspectMenu();
-    m_aspectMenu->exec(QCursor::pos());
-}
-
 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[] = {
@@ -479,7 +721,7 @@ void CViewportTitleDlg::CreateResolutionMenu()
 {
     if (!m_resolutionMenu)
     {
-        m_resolutionMenu = new QMenu(this);
+        m_resolutionMenu = new QMenu("Resolution");
     }
 
     m_resolutionMenu->clear();
@@ -494,17 +736,6 @@ void CViewportTitleDlg::CreateResolutionMenu()
     connect(action, &QAction::triggered, this, &CViewportTitleDlg::OnMenuResolutionCustom);
 }
 
-void CViewportTitleDlg::PopUpResolutionMenu()
-{
-    if (!m_pViewPane)
-    {
-        return;
-    }
-
-    CreateResolutionMenu();
-    m_resolutionMenu->exec(QCursor::pos());
-}
-
 QMenu* const CViewportTitleDlg::GetResolutionMenu()
 {
     CreateResolutionMenu();
@@ -514,14 +745,14 @@ QMenu* const CViewportTitleDlg::GetResolutionMenu()
 //////////////////////////////////////////////////////////////////////////
 void CViewportTitleDlg::OnViewportSizeChanged(int width, int height)
 {
-    m_ui->m_sizeStaticCtrl->setText(QString::fromLatin1("%1 x %2").arg(width).arg(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_ui->m_ratioStaticCtrl->setText(QString::fromLatin1("%1:%2").arg(width / whGCD).arg(height / whGCD));
+        m_aspectMenu->setTitle(QString::fromLatin1("Ratio:  %1:%2").arg(width / whGCD).arg(height / whGCD));
     }
 }
 
@@ -529,9 +760,9 @@ void CViewportTitleDlg::OnViewportSizeChanged(int width, int height)
 void CViewportTitleDlg::OnViewportFOVChanged(float fov)
 {
     const float degFOV = RAD2DEG(fov);
-    if (m_ui &&  m_ui->m_fovStaticCtrl)
+    if (m_fovMenu)
     {
-        m_ui->m_fovStaticCtrl->setText(QString::fromLatin1("%1%2").arg(qRound(degFOV)).arg(QString(QByteArray::fromPercentEncoding("%C2%B0"))));
+        m_fovMenu->setTitle(QString::fromLatin1("FOV:  %1%2").arg(qRound(degFOV)).arg(QString(QByteArray::fromPercentEncoding("%C2%B0"))));
     }
 }
 
@@ -541,7 +772,11 @@ void CViewportTitleDlg::OnEditorNotifyEvent(EEditorNotifyEvent event)
     switch (event)
     {
     case eNotify_OnDisplayRenderUpdate:
-        m_ui->m_toggleHelpersBtn->setChecked(GetIEditor()->GetDisplaySettings()->IsDisplayHelpers());
+        m_debugHelpersAction->setChecked(Helpers::IsHelpersShown());
+        break;
+    case eNotify_OnBeginGameMode:
+    case eNotify_OnEndGameMode:
+        UpdateMuteActionText();
         break;
     }
 }
@@ -615,6 +850,132 @@ bool CViewportTitleDlg::eventFilter(QObject* object, QEvent* event)
     return QWidget::eventFilter(object, event) || consumeEvent;
 }
 
+void CViewportTitleDlg::OnBnClickedSyncplayer()
+{
+    emit ActionTriggered(ID_GAME_SYNCPLAYER);
+
+    bool bSyncPlayer = GetIEditor()->GetGameEngine()->IsSyncPlayerPosition();
+    m_syncPlayerToCameraAction->setChecked(!bSyncPlayer);
+}
+
+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)
+{
+    gSettings.cameraMoveSpeed = aznumeric_cast<float>(Round(text.toDouble(), m_speedStep));
+}
+
+void CViewportTitleDlg::CheckForCameraSpeedUpdate()
+{
+    if (gSettings.cameraMoveSpeed != m_prevMoveSpeed && !m_cameraSpeed->lineEdit()->hasFocus())
+    {
+        m_prevMoveSpeed = gSettings.cameraMoveSpeed;
+        SetSpeedComboBox(gSettings.cameraMoveSpeed);
+    }
+}
+
+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
 {
diff --git a/Code/Sandbox/Editor/ViewportTitleDlg.h b/Code/Sandbox/Editor/ViewportTitleDlg.h
index ce2f116d97..dd0816082a 100644
--- a/Code/Sandbox/Editor/ViewportTitleDlg.h
+++ b/Code/Sandbox/Editor/ViewportTitleDlg.h
@@ -19,8 +19,16 @@
 #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
@@ -42,6 +50,7 @@ class CViewportTitleDlg
     : public QWidget
     , public IEditorNotifyListener
     , public ISystemEventListener
+    , public AZ::VR::VREventBus::Handler
 {
     Q_OBJECT
 public:
@@ -63,10 +72,15 @@ public:
 
     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();
 
@@ -75,9 +89,20 @@ protected:
 
     void OnMaximize();
     void OnToggleHelpers();
-    void OnToggleDisplayInfo();
     void UpdateDisplayInfo();
 
+    //////////////////////////////////////////////////////////////////////////
+    /// VR Event Bus Implementation
+    //////////////////////////////////////////////////////////////////////////
+    void OnHMDInitialized() override;
+    void OnHMDShutdown() override;
+    //////////////////////////////////////////////////////////////////////////
+
+    void SetupCameraDropdownMenu();
+    void SetupResolutionDropdownMenu();
+    void SetupViewportInformationMenu();
+    void SetupOverflowMenu();
+
     QString m_title;
 
     CLayoutViewPane* m_pViewPane;
@@ -87,22 +112,84 @@ protected:
     QStringList m_customFOVPresets;
     QStringList m_customAspectRatioPresets;
 
+    float m_prevMoveSpeed;
+
+    // Speed combobox/lineEdit settings
+    double m_minSpeed = 0.1;
+    double m_maxSpeed = 100.0;
+    double m_speedStep = 0.1;
+    int m_numDecimals = 1;
+
+    // Speed presets
+    float m_speedPresetValues[3] = { 0.1f, 1.0f, 10.0f };
+
+    double m_fieldWidthMultiplier = 1.8;
+
+
     void OnMenuFOVCustom();
 
     void CreateFOVMenu();
-    void PopUpFOVMenu();
 
     void OnMenuAspectRatioCustom();
     void CreateAspectMenu();
-    void PopUpAspectMenu();
 
     void OnMenuResolutionCustom();
     void CreateResolutionMenu();
-    void PopUpResolutionMenu();
+
+    void CreateViewportInformationMenu();
+    QMenu* const GetViewportInformationMenu();
+    void SetNoViewportInfo();
+    void SetNormalViewportInfo();
+    void SetFullViewportInfo();
+    void SetCompactViewportInfo();
+
+    void OnBnClickedSyncplayer();
+    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_debugHelpersAction = nullptr;
+    QAction* m_syncPlayerToCameraAction = 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;
 };
diff --git a/Code/Sandbox/Editor/ViewportTitleDlg.ui b/Code/Sandbox/Editor/ViewportTitleDlg.ui
index e7b5cce1ec..2d547bfa99 100644
--- a/Code/Sandbox/Editor/ViewportTitleDlg.ui
+++ b/Code/Sandbox/Editor/ViewportTitleDlg.ui
@@ -61,121 +61,43 @@
     </widget>
    </item>
    <item>
-    <widget class="QLabel" name="m_fovLabel">
-     <property name="contextMenuPolicy">
-      <enum>Qt::CustomContextMenu</enum>
-     </property>
-     <property name="text">
-      <string>FOV:</string>
-     </property>
-    </widget>
+     <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_resolutionMenu">
+       <property name="icon">
+         <iconset>
+           <normaloff>:/Menu/resolution.svg</normaloff>:/Menu/resolution.svg
+         </iconset>
+       </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="contextMenuPolicy">
-      <enum>Qt::CustomContextMenu</enum>
-     </property>
-     <property name="text">
-      <string>120°</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QLabel" name="m_ratioLabel">
-     <property name="contextMenuPolicy">
-      <enum>Qt::CustomContextMenu</enum>
-     </property>
-     <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="contextMenuPolicy">
-      <enum>Qt::CustomContextMenu</enum>
-     </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="contextMenuPolicy">
-      <enum>Qt::CustomContextMenu</enum>
-     </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="text">
-        <string>Toggle display info</string>
-      </property>
-     <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="text">
-      <string>Toggle display helpers</string>
-     </property>
-     <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>
+     <widget class="QToolButton" name="m_overflowBtn">
+       <property name="icon">
+         <iconset>
+           <normaloff>:/stylesheet/img/UI20/menu-centered.svg</normaloff>:/stylesheet/img/UI20/menu-centered.svg
+         </iconset>
+       </property>
+     </widget>
    </item>
   </layout>
  </widget>
@@ -187,6 +109,8 @@
    <container>1</container>
   </customwidget>
  </customwidgets>
- <resources/>
- <connections/>
+  <resources>
+    <include location="../../Framework/AzQtComponents/AzQtComponents/Images/resources.qrc"/>
+  </resources>
+  <connections/>
 </ui>
diff --git a/Code/Sandbox/Editor/editor_lib_files.cmake b/Code/Sandbox/Editor/editor_lib_files.cmake
index ebd7f89cfb..dc9d794021 100644
--- a/Code/Sandbox/Editor/editor_lib_files.cmake
+++ b/Code/Sandbox/Editor/editor_lib_files.cmake
@@ -424,10 +424,6 @@ set(FILES
     GotoPositionDlg.cpp
     GotoPositionDlg.h
     GotoPositionDlg.ui
-    InfoBar.cpp
-    InfoBar.qrc
-    InfoBar.h
-    InfoBar.ui
     LayoutConfigDialog.cpp
     LayoutConfigDialog.h
     LayoutConfigDialog.ui
diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/ComponentEntityEditorPlugin_precompiled.cpp b/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/ComponentEntityEditorPlugin_precompiled.cpp
deleted file mode 100644
index ce0194251b..0000000000
--- a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/ComponentEntityEditorPlugin_precompiled.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#include "ComponentEntityEditorPlugin_precompiled.h"
diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.cpp b/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.cpp
index 8161d07547..694714cc6e 100644
--- a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.cpp
+++ b/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.cpp
@@ -670,18 +670,11 @@ void SandboxIntegrationManager::PopulateEditorGlobalContextMenu(QMenu* menu, con
         AzToolsFramework::EditorContextMenuBus::Broadcast(&AzToolsFramework::EditorContextMenuEvents::PopulateEditorGlobalContextMenu, menu);
     }
 
-    bool prefabWipFeaturesEnabled = false;
-    AzFramework::ApplicationRequests::Bus::BroadcastResult(
-        prefabWipFeaturesEnabled, &AzFramework::ApplicationRequests::ArePrefabWipFeaturesEnabled);
-
-    if (!prefabSystemEnabled || (prefabSystemEnabled && prefabWipFeaturesEnabled))
+    action = menu->addAction(QObject::tr("Duplicate"));
+    QObject::connect(action, &QAction::triggered, action, [this] { ContextMenu_Duplicate(); });
+    if (selected.size() == 0)
     {
-        action = menu->addAction(QObject::tr("Duplicate"));
-        QObject::connect(action, &QAction::triggered, action, [this] { ContextMenu_Duplicate(); });
-        if (selected.size() == 0)
-        {
-            action->setDisabled(true);
-        }
+        action->setDisabled(true);
     }
 
     if (!prefabSystemEnabled)
diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/componententityeditorplugin_files.cmake b/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/componententityeditorplugin_files.cmake
index 6672bc8b47..2b5877b1e6 100644
--- a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/componententityeditorplugin_files.cmake
+++ b/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/componententityeditorplugin_files.cmake
@@ -15,7 +15,6 @@ set(FILES
     ComponentEntityEditorPlugin.cpp
     SandboxIntegration.h
     SandboxIntegration.cpp
-    ComponentEntityEditorPlugin_precompiled.cpp
     ComponentEntityEditorPlugin_precompiled.h
     UI/ComponentEntityEditorOutlinerWindow.qrc
     UI/QComponentEntityEditorMainWindow.h
diff --git a/Code/Sandbox/Plugins/EditorAssetImporter/EditorAssetImporter_precompiled.cpp b/Code/Sandbox/Plugins/EditorAssetImporter/EditorAssetImporter_precompiled.cpp
deleted file mode 100644
index a77146223e..0000000000
--- a/Code/Sandbox/Plugins/EditorAssetImporter/EditorAssetImporter_precompiled.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "EditorAssetImporter_precompiled.h"
-
diff --git a/Code/Sandbox/Plugins/EditorAssetImporter/editorassetimporter_files.cmake b/Code/Sandbox/Plugins/EditorAssetImporter/editorassetimporter_files.cmake
index 68f7a450a1..c017aa6320 100644
--- a/Code/Sandbox/Plugins/EditorAssetImporter/editorassetimporter_files.cmake
+++ b/Code/Sandbox/Plugins/EditorAssetImporter/editorassetimporter_files.cmake
@@ -23,7 +23,6 @@ set(FILES
     SceneSerializationHandler.h
     SceneSerializationHandler.cpp
     Main.cpp
-    EditorAssetImporter_precompiled.cpp
     EditorAssetImporter_precompiled.h
     AssetImporter.qrc
     AssetImporterWindow.ui
diff --git a/Code/Sandbox/Plugins/FFMPEGPlugin/FFMPEGPlugin_precompiled.cpp b/Code/Sandbox/Plugins/FFMPEGPlugin/FFMPEGPlugin_precompiled.cpp
deleted file mode 100644
index b7f4fd23cc..0000000000
--- a/Code/Sandbox/Plugins/FFMPEGPlugin/FFMPEGPlugin_precompiled.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#include "FFMPEGPlugin_precompiled.h"
-
diff --git a/Code/Sandbox/Plugins/FFMPEGPlugin/ffmpegplugin_files.cmake b/Code/Sandbox/Plugins/FFMPEGPlugin/ffmpegplugin_files.cmake
index 9ae55cc45a..1c36b4c5bc 100644
--- a/Code/Sandbox/Plugins/FFMPEGPlugin/ffmpegplugin_files.cmake
+++ b/Code/Sandbox/Plugins/FFMPEGPlugin/ffmpegplugin_files.cmake
@@ -12,7 +12,6 @@
 set(FILES
     FFMPEGPlugin.rc
     main.cpp
-    FFMPEGPlugin_precompiled.cpp
     FFMPEGPlugin_precompiled.h
     FFMPEGPlugin.cpp
     FFMPEGPlugin.h
diff --git a/Code/Sandbox/Plugins/PerforcePlugin/PerforcePlugin_precompiled.cpp b/Code/Sandbox/Plugins/PerforcePlugin/PerforcePlugin_precompiled.cpp
deleted file mode 100644
index cc1ded61a4..0000000000
--- a/Code/Sandbox/Plugins/PerforcePlugin/PerforcePlugin_precompiled.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "PerforcePlugin_precompiled.h"
-
diff --git a/Code/Sandbox/Plugins/PerforcePlugin/perforceplugin_files.cmake b/Code/Sandbox/Plugins/PerforcePlugin/perforceplugin_files.cmake
index 6e3a497aca..11e81d3358 100644
--- a/Code/Sandbox/Plugins/PerforcePlugin/perforceplugin_files.cmake
+++ b/Code/Sandbox/Plugins/PerforcePlugin/perforceplugin_files.cmake
@@ -20,6 +20,5 @@ set(FILES
     PerforceSourceControl.cpp
     PerforceSourceControl.h
     resource.h
-    PerforcePlugin_precompiled.cpp
     PerforcePlugin_precompiled.h
 )
diff --git a/Code/Sandbox/Plugins/ProjectSettingsTool/ProjectSettingsTool_precompiled.cpp b/Code/Sandbox/Plugins/ProjectSettingsTool/ProjectSettingsTool_precompiled.cpp
deleted file mode 100644
index 82549e649a..0000000000
--- a/Code/Sandbox/Plugins/ProjectSettingsTool/ProjectSettingsTool_precompiled.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#include "ProjectSettingsTool_precompiled.h"
diff --git a/Code/Sandbox/Plugins/ProjectSettingsTool/projectsettingstool_files.cmake b/Code/Sandbox/Plugins/ProjectSettingsTool/projectsettingstool_files.cmake
index 235109e629..72287be08a 100644
--- a/Code/Sandbox/Plugins/ProjectSettingsTool/projectsettingstool_files.cmake
+++ b/Code/Sandbox/Plugins/ProjectSettingsTool/projectsettingstool_files.cmake
@@ -11,7 +11,6 @@
 
 set(FILES
     main.cpp
-    ProjectSettingsTool_precompiled.cpp
     ProjectSettingsTool_precompiled.h
     DefaultImageValidator.cpp
     DefaultImageValidator.h
diff --git a/Code/Tools/ProjectManager/Resources/ProjectManager.qss b/Code/Tools/ProjectManager/Resources/ProjectManager.qss
index c18d61fc24..80470591a8 100644
--- a/Code/Tools/ProjectManager/Resources/ProjectManager.qss
+++ b/Code/Tools/ProjectManager/Resources/ProjectManager.qss
@@ -291,6 +291,30 @@ QTabBar::tab:pressed
     height:50px;
 }
 
+#projectSettingsTab::tab-bar > QPushButton {
+    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+                            stop: 0 #888888, stop: 1.0 #555555);
+    qproperty-flat: true;
+    margin-right:30px;
+    margin-bottom:12px;
+    margin-top:0px;
+    min-width:170px;
+    max-width:170px;
+    min-height:26px;
+    max-height:26px;
+    border-radius: 3px;
+    text-align:center;
+    font-size:13px;
+}
+#projectSettingsTab::tab-bar > QPushButton:hover {
+    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+                            stop: 0 #999999, stop: 1.0 #666666);
+}
+#projectSettingsTab::tab-bar > QPushButton:pressed {
+    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+                            stop: 0 #555555, stop: 1.0 #777777);
+}
+
 #projectSettingsTopFrame {
     background-color:#1E252F;
 }
diff --git a/Code/Tools/ProjectManager/Source/ProjectInfo.cpp b/Code/Tools/ProjectManager/Source/ProjectInfo.cpp
index da0b4ebd61..99649cbfdf 100644
--- a/Code/Tools/ProjectManager/Source/ProjectInfo.cpp
+++ b/Code/Tools/ProjectManager/Source/ProjectInfo.cpp
@@ -15,10 +15,13 @@
 namespace O3DE::ProjectManager
 {
     ProjectInfo::ProjectInfo(const QString& path, const QString& projectName, const QString& displayName,
-        const QString& imagePath, const QString& backgroundImagePath, bool needsBuild)
+        const QString& origin, const QString& summary, const QString& imagePath, const QString& backgroundImagePath,
+        bool needsBuild)
         : m_path(path)
         , m_projectName(projectName)
         , m_displayName(displayName)
+        , m_origin(origin)
+        , m_summary(summary)
         , m_imagePath(imagePath)
         , m_backgroundImagePath(backgroundImagePath)
         , m_needsBuild(needsBuild)
diff --git a/Code/Tools/ProjectManager/Source/ProjectInfo.h b/Code/Tools/ProjectManager/Source/ProjectInfo.h
index 857e6ea4d5..184916a514 100644
--- a/Code/Tools/ProjectManager/Source/ProjectInfo.h
+++ b/Code/Tools/ProjectManager/Source/ProjectInfo.h
@@ -15,6 +15,7 @@
 #if !defined(Q_MOC_RUN)
 #include <AzCore/Math/Uuid.h>
 #include <QString>
+#include <QStringList>
 #endif
 
 namespace O3DE::ProjectManager
@@ -23,8 +24,17 @@ namespace O3DE::ProjectManager
     {
     public:
         ProjectInfo() = default;
-        ProjectInfo(const QString& path, const QString& projectName, const QString& displayName,
-            const QString& imagePath, const QString& backgroundImagePath, bool needsBuild);
+
+        ProjectInfo(
+            const QString& path,
+            const QString& projectName,
+            const QString& displayName,
+            const QString& origin,
+            const QString& summary,
+            const QString& imagePath,
+            const QString& backgroundImagePath,
+            bool needsBuild);
+                    
         bool operator==(const ProjectInfo& rhs);
         bool operator!=(const ProjectInfo& rhs);
 
@@ -36,12 +46,16 @@ namespace O3DE::ProjectManager
         // From project.json
         QString m_projectName;
         QString m_displayName;
+        QString m_origin;
+        QString m_summary;
+        QStringList m_userTags;
 
         // Used on projects home screen
         QString m_imagePath;
         QString m_backgroundImagePath;
 
         // Used in project creation
+
         bool m_needsBuild = false; //! Does this project need to be built
     };
 } // namespace O3DE::ProjectManager
diff --git a/Code/Tools/ProjectManager/Source/PythonBindings.cpp b/Code/Tools/ProjectManager/Source/PythonBindings.cpp
index d7d0414c1f..5e7c78d2ec 100644
--- a/Code/Tools/ProjectManager/Source/PythonBindings.cpp
+++ b/Code/Tools/ProjectManager/Source/PythonBindings.cpp
@@ -19,6 +19,7 @@
 #include <pybind11/functional.h>
 #include <pybind11/embed.h>
 #include <pybind11/eval.h>
+#include <pybind11/stl.h>
 #pragma pop_macro("slots")
 
 #include <AzCore/IO/FileIO.h>
@@ -289,6 +290,7 @@ namespace O3DE::ProjectManager
             m_engineTemplate = pybind11::module::import("o3de.engine_template");
             m_enableGemProject = pybind11::module::import("o3de.enable_gem");
             m_disableGemProject = pybind11::module::import("o3de.disable_gem");
+            m_editProjectProperties = pybind11::module::import("o3de.project_properties");
 
             // make sure the engine is registered
             RegisterThisEngine();
@@ -678,6 +680,15 @@ namespace O3DE::ProjectManager
             {
                 projectInfo.m_projectName = Py_To_String(projectData["project_name"]);
                 projectInfo.m_displayName = Py_To_String_Optional(projectData, "display_name", projectInfo.m_projectName);
+                projectInfo.m_origin = Py_To_String_Optional(projectData, "origin", projectInfo.m_origin);
+                projectInfo.m_summary = Py_To_String_Optional(projectData, "summary", projectInfo.m_summary);
+                if (projectData.contains("user_tags"))
+                {
+                    for (auto tag : projectData["user_tags"])
+                    {
+                        projectInfo.m_userTags.append(Py_To_String(tag));
+                    }
+                }
             }
             catch ([[maybe_unused]] const std::exception& e)
             {
@@ -748,9 +759,27 @@ namespace O3DE::ProjectManager
         });
     }
 
-    bool PythonBindings::UpdateProject([[maybe_unused]] const ProjectInfo& projectInfo)
+    AZ::Outcome<void, AZStd::string> PythonBindings::UpdateProject(const ProjectInfo& projectInfo)
     {
-        return false;
+        return ExecuteWithLockErrorHandling([&]
+            {
+                std::list<std::string> newTags;
+                for (const auto& i : projectInfo.m_userTags)
+                {
+                    newTags.push_back(i.toStdString());
+                }
+
+                m_editProjectProperties.attr("edit_project_props")(
+                    pybind11::str(projectInfo.m_path.toStdString()), // proj_path
+                    pybind11::none(), // proj_name not used
+                    pybind11::str(projectInfo.m_origin.toStdString()), // new_origin
+                    pybind11::str(projectInfo.m_displayName.toStdString()), // new_display
+                    pybind11::str(projectInfo.m_summary.toStdString()), // new_summary
+                    pybind11::str(projectInfo.m_imagePath.toStdString()), // new_icon
+                    pybind11::none(), // add_tags not used
+                    pybind11::none(), // remove_tags not used
+                    pybind11::list(pybind11::cast(newTags))); // replace_tags
+            });
     }
 
     ProjectTemplateInfo PythonBindings::ProjectTemplateInfoFromPath(pybind11::handle path)
diff --git a/Code/Tools/ProjectManager/Source/PythonBindings.h b/Code/Tools/ProjectManager/Source/PythonBindings.h
index 278aa2d5d7..707595b6fd 100644
--- a/Code/Tools/ProjectManager/Source/PythonBindings.h
+++ b/Code/Tools/ProjectManager/Source/PythonBindings.h
@@ -50,7 +50,7 @@ namespace O3DE::ProjectManager
         AZ::Outcome<QVector<ProjectInfo>> GetProjects() override;
         bool AddProject(const QString& path) override;
         bool RemoveProject(const QString& path) override;
-        bool UpdateProject(const ProjectInfo& projectInfo) override;
+        AZ::Outcome<void, AZStd::string> UpdateProject(const ProjectInfo& projectInfo) override;
         AZ::Outcome<void, AZStd::string> AddGemToProject(const QString& gemPath, const QString& projectPath) override;
         AZ::Outcome<void, AZStd::string> RemoveGemFromProject(const QString& gemPath, const QString& projectPath) override;
 
@@ -78,5 +78,6 @@ namespace O3DE::ProjectManager
         pybind11::handle m_manifest;
         pybind11::handle m_enableGemProject;
         pybind11::handle m_disableGemProject;
+        pybind11::handle m_editProjectProperties;
     };
 }
diff --git a/Code/Tools/ProjectManager/Source/PythonBindingsInterface.h b/Code/Tools/ProjectManager/Source/PythonBindingsInterface.h
index 09d9187dbd..fd94a4e964 100644
--- a/Code/Tools/ProjectManager/Source/PythonBindingsInterface.h
+++ b/Code/Tools/ProjectManager/Source/PythonBindingsInterface.h
@@ -122,7 +122,7 @@ namespace O3DE::ProjectManager
          * @param projectInfo the info to use to update the project 
          * @return true on success, false on failure
          */
-        virtual bool UpdateProject(const ProjectInfo& projectInfo) = 0;
+        virtual AZ::Outcome<void, AZStd::string> UpdateProject(const ProjectInfo& projectInfo) = 0;
 
         /**
          * Add a gem to a project
diff --git a/Code/Tools/ProjectManager/Source/UpdateProjectCtrl.cpp b/Code/Tools/ProjectManager/Source/UpdateProjectCtrl.cpp
index 6fcb1b1c71..be1f0e5529 100644
--- a/Code/Tools/ProjectManager/Source/UpdateProjectCtrl.cpp
+++ b/Code/Tools/ProjectManager/Source/UpdateProjectCtrl.cpp
@@ -58,7 +58,7 @@ namespace O3DE::ProjectManager
         tabWidget->tabBar()->setObjectName("projectSettingsTabBar");
         tabWidget->addTab(m_updateSettingsScreen, tr("General"));
 
-        QPushButton* gemsButton = new QPushButton(tr("Add More Gems"), this);
+        QPushButton* gemsButton = new QPushButton(tr("Configure Gems"), this);
         topBarHLayout->addWidget(gemsButton);
         tabWidget->setCornerWidget(gemsButton);
 
@@ -136,10 +136,10 @@ namespace O3DE::ProjectManager
                 // Update project if settings changed
                 if (m_projectInfo != newProjectSettings)
                 {
-                    bool result = PythonBindingsInterface::Get()->UpdateProject(newProjectSettings);
-                    if (!result)
+                    auto result = PythonBindingsInterface::Get()->UpdateProject(newProjectSettings);
+                    if (!result.IsSuccess())
                     {
-                        QMessageBox::critical(this, tr("Project update failed"), tr("Failed to update project."));
+                        QMessageBox::critical(this, tr("Project update failed"), tr(result.GetError().c_str()));
                         return;
                     }
                 }
@@ -189,7 +189,7 @@ namespace O3DE::ProjectManager
     {
         if (m_stack->currentIndex() == ScreenOrder::Gems)
         {
-            m_header->setSubTitle(QString(tr("Add More Gems to \"%1\"")).arg(m_projectInfo.m_projectName));
+            m_header->setSubTitle(QString(tr("Configure Gems for \"%1\"")).arg(m_projectInfo.m_projectName));
             m_nextButton->setText(tr("Confirm"));
         }
         else
diff --git a/Code/Tools/Standalone/StandaloneTools_precompiled.cpp b/Code/Tools/Standalone/StandaloneTools_precompiled.cpp
deleted file mode 100644
index 073859f9b8..0000000000
--- a/Code/Tools/Standalone/StandaloneTools_precompiled.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include "StandaloneTools_precompiled.h"
-
diff --git a/Code/Tools/Standalone/standalone_tools_files.cmake b/Code/Tools/Standalone/standalone_tools_files.cmake
index 57e3e45d66..65933bd8c6 100644
--- a/Code/Tools/Standalone/standalone_tools_files.cmake
+++ b/Code/Tools/Standalone/standalone_tools_files.cmake
@@ -10,7 +10,6 @@
 #
 
 set(FILES
-    StandaloneTools_precompiled.cpp
     StandaloneTools_precompiled.h
     targetver.h
     Source/StandaloneToolsApplication.cpp
diff --git a/Gems/AssetMemoryAnalyzer/Code/Source/AssetMemoryAnalyzer_precompiled.cpp b/Gems/AssetMemoryAnalyzer/Code/Source/AssetMemoryAnalyzer_precompiled.cpp
deleted file mode 100644
index 75643c0cf7..0000000000
--- a/Gems/AssetMemoryAnalyzer/Code/Source/AssetMemoryAnalyzer_precompiled.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#include "AssetMemoryAnalyzer_precompiled.h"
diff --git a/Gems/AssetMemoryAnalyzer/Code/assetmemoryanalyzer_files.cmake b/Gems/AssetMemoryAnalyzer/Code/assetmemoryanalyzer_files.cmake
index 88994a2b47..8119a6e870 100644
--- a/Gems/AssetMemoryAnalyzer/Code/assetmemoryanalyzer_files.cmake
+++ b/Gems/AssetMemoryAnalyzer/Code/assetmemoryanalyzer_files.cmake
@@ -10,7 +10,6 @@
 #
 
 set(FILES
-    Source/AssetMemoryAnalyzer_precompiled.cpp
     Source/AssetMemoryAnalyzer_precompiled.h
     Include/AssetMemoryAnalyzer/AssetMemoryAnalyzerBus.h
     Source/AssetMemoryAnalyzer.cpp
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageProcessing_precompiled.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageProcessing_precompiled.cpp
deleted file mode 100644
index 35211fa378..0000000000
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageProcessing_precompiled.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
-* All or portions of this file Copyright(c) Amazon.com, Inc.or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution(the "License").All use of this software is governed by the License,
-*or, if provided, by the license below or the license accompanying this file.Do not
-* remove or modify any license notices.This file is distributed on an "AS IS" BASIS,
-*WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include "ImageProcessing_precompiled.h"
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/imageprocessing_files.cmake b/Gems/Atom/Asset/ImageProcessingAtom/Code/imageprocessing_files.cmake
index 69c678877d..c7ecee12bb 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/imageprocessing_files.cmake
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/imageprocessing_files.cmake
@@ -10,7 +10,6 @@
 #
 
 set(FILES
-    Source/ImageProcessing_precompiled.cpp
     Source/ImageProcessing_precompiled.h
     Source/Compressors/CryTextureSquisher/CryTextureSquisher.cpp
     Source/Compressors/CryTextureSquisher/CryTextureSquisher.h
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/Atom_RHI_DX12_precompiled.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/Atom_RHI_DX12_precompiled.cpp
deleted file mode 100644
index cb87449665..0000000000
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/Atom_RHI_DX12_precompiled.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
- * its licensors.
- *
- * For complete copyright and license terms please see the LICENSE at the root of this
- * distribution (the "License"). All use of this software is governed by the License,
- * or, if provided, by the license below or the license accompanying this file. Do not
- * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *
- */
-#include <RHI/Atom_RHI_DX12_precompiled.h>
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 3325964d17..13917b3f0d 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
@@ -11,7 +11,6 @@
 
 set(FILES
     Source/RHI/Atom_RHI_DX12_precompiled.h
-    Source/RHI/Atom_RHI_DX12_precompiled.cpp
     Source/RHI/Buffer.cpp
     Source/RHI/Buffer.h
     Source/RHI/BufferPool.cpp
diff --git a/Gems/Atom/RHI/Metal/Code/Source/Atom_RHI_Metal_precompiled.cpp b/Gems/Atom/RHI/Metal/Code/Source/Atom_RHI_Metal_precompiled.cpp
deleted file mode 100644
index 42d5a87697..0000000000
--- a/Gems/Atom/RHI/Metal/Code/Source/Atom_RHI_Metal_precompiled.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#include "Atom_RHI_Metal_precompiled.h"
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 3eb2579038..d678075f14 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
@@ -10,6 +10,5 @@
 #
 
 set(FILES
-    Source/Atom_RHI_Metal_precompiled.cpp
     Source/Atom_RHI_Metal_precompiled.h
 )
diff --git a/Gems/Atom/RHI/Null/Code/Source/Atom_RHI_Null_precompiled.cpp b/Gems/Atom/RHI/Null/Code/Source/Atom_RHI_Null_precompiled.cpp
deleted file mode 100644
index 56bdaca01b..0000000000
--- a/Gems/Atom/RHI/Null/Code/Source/Atom_RHI_Null_precompiled.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#include "Atom_RHI_Null_precompiled.h"
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 f0f7fd03de..aeb34c55a6 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
@@ -10,6 +10,5 @@
 #
 
 set(FILES
-    Source/Atom_RHI_Null_precompiled.cpp
     Source/Atom_RHI_Null_precompiled.h
 )
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/Atom_RHI_Vulkan_precompiled.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/Atom_RHI_Vulkan_precompiled.cpp
deleted file mode 100644
index 65e8f51730..0000000000
--- a/Gems/Atom/RHI/Vulkan/Code/Source/Atom_RHI_Vulkan_precompiled.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#include "Atom_RHI_Vulkan_precompiled.h"
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Device.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Device.cpp
index 76662ebc6e..04f2465e78 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Device.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Device.cpp
@@ -720,7 +720,7 @@ namespace AZ
             StringList deviceExtensions = physicalDevice.GetDeviceExtensionNames();
             StringList::iterator itRayTracingExtension = AZStd::find(deviceExtensions.begin(), deviceExtensions.end(), VK_KHR_RAY_TRACING_PIPELINE_EXTENSION_NAME);
             m_features.m_rayTracing = (itRayTracingExtension != deviceExtensions.end());
-            m_features.m_unboundedArrays = true;
+            m_features.m_unboundedArrays = physicalDevice.GetPhysicalDeviceDescriptorIndexingFeatures().shaderStorageTexelBufferArrayNonUniformIndexing;
 
             const auto& deviceLimits = physicalDevice.GetDeviceLimits();
             m_limits.m_maxImageDimension1D = deviceLimits.maxImageDimension1D;
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 83a962fb2b..717f2ff994 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
@@ -10,6 +10,5 @@
 #
 
 set(FILES
-    Source/Atom_RHI_Vulkan_precompiled.cpp
     Source/Atom_RHI_Vulkan_precompiled.h
 )
diff --git a/Gems/Atom/RPI/Code/CMakeLists.txt b/Gems/Atom/RPI/Code/CMakeLists.txt
index 2898967add..8a2684347e 100644
--- a/Gems/Atom/RPI/Code/CMakeLists.txt
+++ b/Gems/Atom/RPI/Code/CMakeLists.txt
@@ -150,6 +150,7 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
             PRIVATE
                 AZ::AtomCore
                 AZ::AzTest
+                AZ::AzTestShared
                 AZ::AzFramework
                 AZ::AzToolsFramework
                 Legacy::CryCommon
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 0e7f11e46e..525bbc1521 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
@@ -81,7 +81,7 @@ namespace AZ
             //! Common arguments for free polygon (point, line, Triangle) draws.
             struct AuxGeomDynamicDrawArguments
             {
-                const AZ::Vector3* m_verts = nullptr; //!< An array of points, 1 for each vertice.
+                const AZ::Vector3* m_verts = nullptr; //!< An array of points, 1 for each vertex.
                 uint32_t m_vertCount = 0; //!< The number of vertices.
                 const AZ::Color* m_colors; //!< An array of colors, must have either vertCount entries or 1 entry.
                 uint32_t m_colorCount = 0; //!< The number of colors, must equal 1 or vertCount.
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 35af200759..514e3e37a5 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
@@ -61,12 +61,13 @@ namespace AZ
             //! Important: only to be used in the Editor, it may kick off a job to calculate spatial information.
             //! [GFX TODO][ATOM-4343 Bake mesh spatial during AP processing]
             //!
-            //! @param rayStart  position where the ray starts
-            //! @param dir  direction where the ray ends (does not have to be unit length)
-            //! @param distanceFactor  if an intersection is detected, this will be set such that distanceFactor * dir.length == distance to intersection
-            //! @param normal  if an intersection is detected, this will be set to the normal at the point of intersection
-            //! @return  true if the ray intersects the mesh
-            bool LocalRayIntersection(const AZ::Vector3& rayStart, const AZ::Vector3& dir, float& distanceFactor, AZ::Vector3& normal) const;
+            //! @param rayStart  The starting point of the ray.
+            //! @param rayDir  The direction and length of the ray (magnitude is encoded in the direction).
+            //! @param[out] distanceNormalized  If an intersection is found, will be set to the normalized distance of the intersection
+            //! (in the range 0.0-1.0) - to calculate the actual distance, multiply distanceNormalized by the magnitude of rayDir.
+            //! @param[out] normal If an intersection is found, will be set to the normal at the point of collision.
+            //! @return  True if the ray intersects the mesh.
+            bool LocalRayIntersection(const AZ::Vector3& rayStart, const AZ::Vector3& rayDir, float& distanceNormalized, AZ::Vector3& normal) const;
 
             //! Checks a ray for intersection against this model, where the ray is in a different coordinate space.
             //! Important: only to be used in the Editor, it may kick off a job to calculate spatial information.
@@ -74,13 +75,19 @@ namespace AZ
             //!
             //! @param modelTransform  a transform that puts the model into the ray's coordinate space
             //! @param nonUniformScale  Non-uniform scale applied in the model's local frame.
-            //! @param rayStart  position where the ray starts
-            //! @param dir  direction where the ray ends (does not have to be unit length)
-            //! @param distanceFactor  if an intersection is detected, this will be set such that distanceFactor * dir.length == distance to intersection
-            //! @param normal  if an intersection is detected, this will be set to the normal at the point of intersection
-            //! @return  true if the ray intersects the mesh
-            bool RayIntersection(const AZ::Transform& modelTransform, const AZ::Vector3& nonUniformScale, const AZ::Vector3& rayStart,
-                const AZ::Vector3& dir, float& distanceFactor, AZ::Vector3& normal) const;
+            //! @param rayStart  The starting point of the ray.
+            //! @param rayDir  The direction and length of the ray (magnitude is encoded in the direction).
+            //! @param[out] distanceNormalized  If an intersection is found, will be set to the normalized distance of the intersection
+            //! (in the range 0.0-1.0) - to calculate the actual distance, multiply distanceNormalized by the magnitude of rayDir.
+            //! @param[out] normal If an intersection is found, will be set to the normal at the point of collision.
+            //! @return  True if the ray intersects the mesh.
+            bool RayIntersection(
+                const AZ::Transform& modelTransform,
+                const AZ::Vector3& nonUniformScale,
+                const AZ::Vector3& rayStart,
+                const AZ::Vector3& rayDir,
+                float& distanceNormalized,
+                AZ::Vector3& normal) const;
 
             //! Get available UV names from the model and its lods.
             const AZStd::unordered_set<AZ::Name>& GetUvNames() const;
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 8a773dc29e..f3da349195 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
@@ -63,12 +63,14 @@ namespace AZ
             //! Important: only to be used in the Editor, it may kick off a job to calculate spatial information.
             //! [GFX TODO][ATOM-4343 Bake mesh spatial information during AP processing]
             //!
-            //! @param rayStart  position where the ray starts
-            //! @param dir  direction where the ray ends (does not have to be unit length)
-            //! @param distance  if an intersection is detected, this will be set such that distanceFactor * dir.length == distance to intersection
-            //! @param normal if an intersection is detected, this will be set to the normal at the point of collision
-            //! @return  true if the ray intersects the mesh
-            virtual bool LocalRayIntersectionAgainstModel(const AZ::Vector3& rayStart, const AZ::Vector3& dir, float& distance, AZ::Vector3& normal) const;
+            //! @param rayStart  The starting point of the ray.
+            //! @param rayDir  The direction and length of the ray (magnitude is encoded in the direction).
+            //! @param[out] distanceNormalized  If an intersection is found, will be set to the normalized distance of the intersection
+            //! (in the range 0.0-1.0) - to calculate the actual distance, multiply distanceNormalized by the magnitude of rayDir.
+            //! @param[out] normal If an intersection is found, will be set to the normal at the point of collision.
+            //! @return  True if the ray intersects the mesh.
+            virtual bool LocalRayIntersectionAgainstModel(
+                const AZ::Vector3& rayStart, const AZ::Vector3& rayDir, float& distanceNormalized, AZ::Vector3& normal) const;
 
         private:
             void SetReady();
@@ -79,9 +81,15 @@ namespace AZ
 
             // mutable method
             void BuildKdTree() const;
-            bool BruteForceRayIntersect(const AZ::Vector3& rayStart, const AZ::Vector3& dir, float& distance, AZ::Vector3& normal) const;
+            bool BruteForceRayIntersect(
+                const AZ::Vector3& rayStart, const AZ::Vector3& rayDir, float& distanceNormalized, AZ::Vector3& normal) const;
 
-            bool LocalRayIntersectionAgainstMesh(const ModelLodAsset::Mesh& mesh, const AZ::Vector3& rayStart, const AZ::Vector3& dir, float& distance, AZ::Vector3& normal) const;
+            bool LocalRayIntersectionAgainstMesh(
+                const ModelLodAsset::Mesh& mesh,
+                const AZ::Vector3& rayStart,
+                const AZ::Vector3& rayDir,
+                float& distanceNormalized,
+                AZ::Vector3& normal) const;
 
             // Various model information used in raycasting
             AZ::Name m_positionName{ "POSITION" };
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 86477bf785..17ff2c64c8 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/Model/Model.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Model/Model.cpp
@@ -137,12 +137,12 @@ namespace AZ
             return m_modelAsset;
         }
 
-        bool Model::LocalRayIntersection(const AZ::Vector3& rayStart, const AZ::Vector3& dir, float& distance, AZ::Vector3& normal) const
+        bool Model::LocalRayIntersection(const AZ::Vector3& rayStart, const AZ::Vector3& rayDir, float& distanceNormalized, AZ::Vector3& normal) const
         {
             AZ_PROFILE_FUNCTION(Debug::ProfileCategory::AzRender);
             float start;
             float end;
-            const int result = Intersect::IntersectRayAABB2(rayStart, dir.GetReciprocal(), m_aabb, start, end);
+            const int result = Intersect::IntersectRayAABB2(rayStart, rayDir.GetReciprocal(), m_aabb, start, end);
             if (Intersect::ISECT_RAY_AABB_NONE != result)
             {
                 if (ModelAsset* modelAssetPtr = m_modelAsset.Get())
@@ -151,7 +151,7 @@ namespace AZ
                     AZ::Debug::Timer timer;
                     timer.Stamp();
 #endif
-                    const bool hit = modelAssetPtr->LocalRayIntersectionAgainstModel(rayStart, dir, distance, normal);
+                    const bool hit = modelAssetPtr->LocalRayIntersectionAgainstModel(rayStart, rayDir, distanceNormalized, normal);
 #if defined(AZ_RPI_PROFILE_RAYCASTING_AGAINST_MODELS)
                     if (hit)
                     {
@@ -166,8 +166,12 @@ namespace AZ
         }
 
         bool Model::RayIntersection(
-            const AZ::Transform& modelTransform, const AZ::Vector3& nonUniformScale, const AZ::Vector3& rayStart, const AZ::Vector3& dir,
-            float& distanceFactor, AZ::Vector3& normal) const
+            const AZ::Transform& modelTransform,
+            const AZ::Vector3& nonUniformScale,
+            const AZ::Vector3& rayStart,
+            const AZ::Vector3& rayDir,
+            float& distanceNormalized,
+            AZ::Vector3& normal) const
         {
             AZ_PROFILE_FUNCTION(Debug::ProfileCategory::AzRender);
             const AZ::Vector3 clampedScale = nonUniformScale.GetMax(AZ::Vector3(AZ::MinTransformScale));
@@ -175,12 +179,13 @@ namespace AZ
             const AZ::Transform inverseTM = modelTransform.GetInverse();
             const AZ::Vector3 raySrcLocal = inverseTM.TransformPoint(rayStart) / clampedScale;
 
-            // Instead of just rotating 'dir' we need it to be scaled too, so that 'distanceFactor' will be in the target units rather than object local units.
-            const AZ::Vector3 rayDest = rayStart + dir;
+            // Instead of just rotating 'rayDir' we need it to be scaled too, so that 'distanceNormalized' will be in the target units rather
+            // than object local units.
+            const AZ::Vector3 rayDest = rayStart + rayDir;
             const AZ::Vector3 rayDestLocal = inverseTM.TransformPoint(rayDest) / clampedScale;
             const AZ::Vector3 rayDirLocal = rayDestLocal - raySrcLocal;
 
-            bool result = LocalRayIntersection(raySrcLocal, rayDirLocal, distanceFactor, normal);
+            const bool result = LocalRayIntersection(raySrcLocal, rayDirLocal, distanceNormalized, normal);
             normal = (normal * clampedScale).GetNormalized();
             return result;
         }
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 988d07e66d..52fda0f56b 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Model/ModelAsset.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Model/ModelAsset.cpp
@@ -15,6 +15,7 @@
 #include <AzCore/Debug/EventTrace.h>
 #include <AzCore/Jobs/JobFunction.h>
 #include <AzCore/Math/IntersectSegment.h>
+#include <AzCore/std/limits.h>
 
 #include <AzCore/RTTI/ReflectContext.h>
 #include <AzCore/Serialization/SerializeContext.h>
@@ -75,7 +76,8 @@ namespace AZ
             m_status = Data::AssetData::AssetStatus::Ready;
         }
 
-        bool ModelAsset::LocalRayIntersectionAgainstModel(const AZ::Vector3& rayStart, const AZ::Vector3& dir, float& distance, AZ::Vector3& normal) const
+        bool ModelAsset::LocalRayIntersectionAgainstModel(
+            const AZ::Vector3& rayStart, const AZ::Vector3& rayDir, float& distanceNormalized, AZ::Vector3& normal) const
         {
             AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzRender);
 
@@ -85,7 +87,7 @@ namespace AZ
                 m_modelTriangleCount = CalculateTriangleCount();
             }
 
-            // check the total vertex count for this model and skip kdtree if the model is simple enough
+            // check the total vertex count for this model and skip kd-tree if the model is simple enough
             if (*m_modelTriangleCount > s_minimumModelTriangleCountToOptimize)
             {
                 if (!m_kdTree)
@@ -97,11 +99,11 @@ namespace AZ
                 }
                 else
                 {
-                    return m_kdTree->RayIntersection(rayStart, dir, distance, normal);
+                    return m_kdTree->RayIntersection(rayStart, rayDir, distanceNormalized, normal);
                 }
             }
 
-            return BruteForceRayIntersect(rayStart, dir, distance, normal);
+            return BruteForceRayIntersect(rayStart, rayDir, distanceNormalized, normal);
         }
 
         void ModelAsset::BuildKdTree() const
@@ -136,7 +138,8 @@ namespace AZ
             }
         }
 
-        bool ModelAsset::BruteForceRayIntersect(const AZ::Vector3& rayStart, const AZ::Vector3& dir, float& distance, AZ::Vector3& normal) const
+        bool ModelAsset::BruteForceRayIntersect(
+            const AZ::Vector3& rayStart, const AZ::Vector3& rayDir, float& distanceNormalized, AZ::Vector3& normal) const
         {
             // brute force - check every triangle
             if (GetLodAssets().empty() == false)
@@ -144,27 +147,27 @@ namespace AZ
                 // intersect against the highest level of detail
                 if (ModelLodAsset* loadAssetPtr = GetLodAssets()[0].Get())
                 {
-                    float shortestDistance = std::numeric_limits<float>::max();
                     bool anyHit = false;
-
                     AZ::Vector3 intersectionNormal;
-
+                    float shortestDistanceNormalized = AZStd::numeric_limits<float>::max();
                     for (const ModelLodAsset::Mesh& mesh : loadAssetPtr->GetMeshes())
                     {
-                        if (LocalRayIntersectionAgainstMesh(mesh, rayStart, dir, distance, intersectionNormal))
+                        float currentDistanceNormalized;
+                        if (LocalRayIntersectionAgainstMesh(mesh, rayStart, rayDir, currentDistanceNormalized, intersectionNormal))
                         {
                             anyHit = true;
-                            if (distance < shortestDistance)
+
+                            if (currentDistanceNormalized < shortestDistanceNormalized)
                             {
                                 normal = intersectionNormal;
-                                shortestDistance = distance;
+                                shortestDistanceNormalized = currentDistanceNormalized;
                             }
                         }
                     }
 
                     if (anyHit)
                     {
-                        distance = shortestDistance;
+                        distanceNormalized = shortestDistanceNormalized;
                     }
 
                     return anyHit;
@@ -174,7 +177,12 @@ namespace AZ
             return false;
         }
 
-        bool ModelAsset::LocalRayIntersectionAgainstMesh(const ModelLodAsset::Mesh& mesh, const AZ::Vector3& rayStart, const AZ::Vector3& dir, float& distance, AZ::Vector3& normal) const
+        bool ModelAsset::LocalRayIntersectionAgainstMesh(
+            const ModelLodAsset::Mesh& mesh,
+            const AZ::Vector3& rayStart,
+            const AZ::Vector3& rayDir,
+            float& distanceNormalized,
+            AZ::Vector3& normal) const
         {
             const BufferAssetView& indexBufferView = mesh.GetIndexBufferAssetView();
             const AZStd::array_view<ModelLodAsset::Mesh::StreamBufferInfo>& streamBufferList = mesh.GetStreamBufferInfoList();
@@ -217,14 +225,13 @@ namespace AZ
                 AZStd::array_view<uint8_t> indexRawBuffer = indexAssetViewPtr->GetBuffer();
                 RHI::BufferViewDescriptor indexRawDesc = indexAssetViewPtr->GetBufferViewDescriptor();
 
-                float closestNormalizedDistance = 1.f;
                 bool anyHit = false;
 
-                const AZ::Vector3 rayEnd = rayStart + dir * distance;
+                const AZ::Vector3 rayEnd = rayStart + rayDir;
                 AZ::Vector3 a, b, c;
                 AZ::Vector3 intersectionNormal;
-                float normalizedDistance = 1.f;
 
+                float shortestDistanceNormalized = AZStd::numeric_limits<float>::max();
                 const AZ::u32* indexPtr = reinterpret_cast<const AZ::u32*>(indexRawBuffer.data());
                 for (uint32_t indexIter = 0; indexIter <= indexRawDesc.m_elementCount - 3; indexIter += 3, indexPtr += 3)
                 {
@@ -247,20 +254,22 @@ namespace AZ
                     p = reinterpret_cast<const float*>(&positionRawBuffer[index2 * positionElementSize]);
                     c.Set(const_cast<float*>(p));
 
-                    if (AZ::Intersect::IntersectSegmentTriangleCCW(rayStart, rayEnd, a, b, c, intersectionNormal, normalizedDistance))
+                    float currentDistanceNormalized;
+                    if (AZ::Intersect::IntersectSegmentTriangleCCW(rayStart, rayEnd, a, b, c, intersectionNormal, currentDistanceNormalized))
                     {
-                        if (normalizedDistance < closestNormalizedDistance)
+                        anyHit = true;
+
+                        if (currentDistanceNormalized < shortestDistanceNormalized)
                         {
                             normal = intersectionNormal;
-                            closestNormalizedDistance = normalizedDistance;
+                            shortestDistanceNormalized = currentDistanceNormalized;
                         }
-                        anyHit = true;
                     }
                 }
 
                 if (anyHit)
                 {
-                    distance = closestNormalizedDistance * distance;
+                    distanceNormalized = shortestDistanceNormalized;
                 }
 
                 return anyHit;
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 bee489c2fd..2ee6d93df3 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Model/ModelKdTree.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Model/ModelKdTree.cpp
@@ -208,10 +208,10 @@ namespace AZ
         bool ModelKdTree::RayIntersection(
             const AZ::Vector3& raySrc, const AZ::Vector3& rayDir, float& distanceNormalized, AZ::Vector3& normal) const
         {
-            float closestDistanceNormalized = AZStd::numeric_limits<float>::max();
-            if (RayIntersectionRecursively(m_pRootNode.get(), raySrc, rayDir, closestDistanceNormalized, normal))
+            float shortestDistanceNormalized = AZStd::numeric_limits<float>::max();
+            if (RayIntersectionRecursively(m_pRootNode.get(), raySrc, rayDir, shortestDistanceNormalized, normal))
             {
-                distanceNormalized = closestDistanceNormalized;
+                distanceNormalized = shortestDistanceNormalized;
                 return true;
             }
 
diff --git a/Gems/Atom/RPI/Code/Tests/Model/ModelTests.cpp b/Gems/Atom/RPI/Code/Tests/Model/ModelTests.cpp
index 3ce17bee8b..f039240ee0 100644
--- a/Gems/Atom/RPI/Code/Tests/Model/ModelTests.cpp
+++ b/Gems/Atom/RPI/Code/Tests/Model/ModelTests.cpp
@@ -22,6 +22,7 @@
 #include <AzCore/std/limits.h>
 #include <AzCore/Component/Entity.h>
 
+#include <AZTestShared/Math/MathTestHelpers.h>
 #include <AzTest/AzTest.h>
 
 #include <Common/RPITestFixture.h>
@@ -568,7 +569,7 @@ namespace UnitTest
         ValidateModelAsset(serializedModelAsset.Get(), expectedModel);
     }
 
-    // Tests that if we try to set the name on a Model 
+    // Tests that if we try to set the name on a Model
     // before calling Begin that it will fail.
     TEST_F(ModelTests, SetNameNoBegin)
     {
@@ -581,7 +582,7 @@ namespace UnitTest
         creator.SetName("TestName");
     }
 
-    // Tests that if we try to add a ModelLod to a Model 
+    // Tests that if we try to add a ModelLod to a Model
     // before calling Begin that it will fail.
     TEST_F(ModelTests, AddLodNoBegin)
     {
@@ -598,7 +599,7 @@ namespace UnitTest
         creator.AddLodAsset(AZStd::move(lod));
     }
 
-    // Tests that if we create a ModelAsset without adding 
+    // Tests that if we create a ModelAsset without adding
     // any ModelLodAssets that the creator will properly fail to produce an asset.
     TEST_F(ModelTests, CreateModelNoLods)
     {
@@ -618,8 +619,8 @@ namespace UnitTest
         ASSERT_EQ(asset.Get(), nullptr);
     }
 
-    // Tests that if we call SetLodIndexBuffer without calling 
-    // Begin first on the ModelLodAssetCreator that it 
+    // Tests that if we call SetLodIndexBuffer without calling
+    // Begin first on the ModelLodAssetCreator that it
     // fails as expected.
     TEST_F(ModelTests, SetLodIndexBufferNoBegin)
     {
@@ -633,8 +634,8 @@ namespace UnitTest
         creator.SetLodIndexBuffer(validIndexBuffer);
     }
 
-    // Tests that if we call AddLodStreamBuffer without calling 
-    // Begin first on the ModelLodAssetCreator that it 
+    // Tests that if we call AddLodStreamBuffer without calling
+    // Begin first on the ModelLodAssetCreator that it
     // fails as expected.
     TEST_F(ModelTests, AddLodStreamBufferNoBegin)
     {
@@ -648,8 +649,8 @@ namespace UnitTest
         creator.AddLodStreamBuffer(validStreamBuffer);
     }
 
-    // Tests that if we call BeginMesh without calling 
-    // Begin first on the ModelLodAssetCreator that it 
+    // Tests that if we call BeginMesh without calling
+    // Begin first on the ModelLodAssetCreator that it
     // fails as expected.
     TEST_F(ModelTests, BeginMeshNoBegin)
     {
@@ -662,13 +663,13 @@ namespace UnitTest
     }
 
     // Tests that if we try to set an AABB on a mesh
-    // without calling Begin or BeginMesh that it fails 
+    // without calling Begin or BeginMesh that it fails
     // as expected. Also tests the case that Begin *is*
     // called but BeginMesh is not.
     TEST_F(ModelTests, SetAabbNoBeginNoBeginMesh)
     {
         using namespace AZ;
-        
+
         RPI::ModelLodAssetCreator creator;
 
         AZ::Aabb aabb = AZ::Aabb::CreateCenterRadius(AZ::Vector3::CreateZero(), 1.0f);
@@ -691,13 +692,13 @@ namespace UnitTest
     }
 
     // Tests that if we try to set the material id on a mesh
-    // without calling Begin or BeginMesh that it fails 
+    // without calling Begin or BeginMesh that it fails
     // as expected. Also tests the case that Begin *is*
     // called but BeginMesh is not.
     TEST_F(ModelTests, SetMaterialIdNoBeginNoBeginMesh)
     {
         using namespace AZ;
-        
+
         RPI::ModelLodAssetCreator creator;
 
         {
@@ -715,7 +716,7 @@ namespace UnitTest
     }
 
     // Tests that if we try to set the index buffer on a mesh
-    // without calling Begin or BeginMesh that it fails 
+    // without calling Begin or BeginMesh that it fails
     // as expected. Also tests the case that Begin *is*
     // called but BeginMesh is not.
     TEST_F(ModelTests, SetIndexBufferNoBeginNoBeginMesh)
@@ -751,7 +752,7 @@ namespace UnitTest
     }
 
     // Tests that if we try to add a stream buffer on a mesh
-    // without calling Begin or BeginMesh that it fails 
+    // without calling Begin or BeginMesh that it fails
     // as expected. Also tests the case that Begin *is*
     // called but BeginMesh is not.
     TEST_F(ModelTests, AddStreamBufferNoBeginNoBeginMesh)
@@ -785,7 +786,7 @@ namespace UnitTest
         }
     }
 
-    // Tests that if we try to end the creation of a 
+    // Tests that if we try to end the creation of a
     // ModelLodAsset that has no meshes that it fails
     // as expected.
     TEST_F(ModelTests, CreateLodNoMeshes)
@@ -804,7 +805,7 @@ namespace UnitTest
         ASSERT_EQ(asset.Get(), nullptr);
     }
 
-    // Tests that validation still fails when expected 
+    // Tests that validation still fails when expected
     // even after producing a valid mesh due to a missing
     // BeginMesh call
     TEST_F(ModelTests, SecondMeshFailureNoBeginMesh)
@@ -862,8 +863,8 @@ namespace UnitTest
         ASSERT_EQ(asset->GetMeshes().size(), 1);
     }
 
-    // Tests that validation still fails when expected 
-    // even after producing a valid mesh due to SetMeshX 
+    // Tests that validation still fails when expected
+    // even after producing a valid mesh due to SetMeshX
     // calls coming after End
     TEST_F(ModelTests, SecondMeshAfterEnd)
     {
@@ -907,7 +908,7 @@ namespace UnitTest
             AZ::Aabb aabb = AZ::Aabb::CreateCenterRadius(Vector3::CreateZero(), 1.0f);
 
             ErrorMessageFinder messageFinder("Begin() was not called", 6);
-            
+
             creator.BeginMesh();
             creator.SetMeshAabb(AZStd::move(aabb));
             creator.SetMeshMaterialAsset(m_materialAsset);
@@ -955,6 +956,20 @@ namespace UnitTest
         EXPECT_EQ(uvStreamTangentBitmask.GetFullTangentBitmask(), 0x70000F51);
     }
 
+    //
+    //   +----+
+    //  /    /|
+    // +----+ |
+    // |    | +
+    // |    |/
+    // +----+
+    //
+    static constexpr AZStd::array CubePositions = { -1.0f, 1.0f, 1.0f,  1.0f, 1.0f, 1.0f,  -1.0f, -1.0f, 1.0f,  1.0f, -1.0f, 1.0f,
+                                                    -1.0f, 1.0f, -1.0f, 1.0f, 1.0f, -1.0f, -1.0f, -1.0f, -1.0f, 1.0f, -1.0f, -1.0f };
+    static constexpr AZStd::array CubeIndices = {
+        uint32_t{ 0 }, 2, 1, 1, 2, 3, 4, 5, 6, 5, 7, 6, 0, 4, 2, 4, 6, 2, 1, 3, 5, 5, 3, 7, 0, 1, 4, 4, 1, 5, 2, 6, 3, 6, 7, 3,
+    };
+
     // This class creates a Model with one LOD, whose mesh contains 2 planes. Plane 1 is in the XY plane at Z=-0.5, and
     // plane 2 is in the XY plane at Z=0.5. The two planes each have 9 quads which have been triangulated. It only has
     // a position and index buffer.
@@ -972,52 +987,75 @@ namespace UnitTest
     //          *---*---*---*
     //           \ / \ / \ / \
     //            *---*---*---*
+    static constexpr AZStd::array TwoSeparatedPlanesPositions{
+        -1.0f,   -0.333f, -0.5f, -0.333f, -1.0f,   -0.5f, -0.333f, -0.333f, -0.5f, 0.333f, -0.333f, -0.5f, 1.0f,    -1.0f,   -0.5f,
+        1.0f,    -0.333f, -0.5f, 0.333f,  -1.0f,   -0.5f, 0.333f,  1.0f,    -0.5f, 1.0f,   0.333f,  -0.5f, 1.0f,    1.0f,    -0.5f,
+        0.333f,  0.333f,  -0.5f, -0.333f, 1.0f,    -0.5f, -0.333f, 0.333f,  -0.5f, -1.0f,  1.0f,    -0.5f, -1.0f,   0.333f,  -0.5f,
+        -1.0f,   -0.333f, 0.5f,  -0.333f, -1.0f,   0.5f,  -0.333f, -0.333f, 0.5f,  0.333f, -0.333f, 0.5f,  1.0f,    -1.0f,   0.5f,
+        1.0f,    -0.333f, 0.5f,  -0.333f, -0.333f, 0.5f,  0.333f,  -1.0f,   0.5f,  0.333f, -0.333f, 0.5f,  0.333f,  1.0f,    0.5f,
+        1.0f,    0.333f,  0.5f,  1.0f,    1.0f,    0.5f,  0.333f,  0.333f,  0.5f,  1.0f,   -0.333f, 0.5f,  -0.333f, 1.0f,    0.5f,
+        -0.333f, 0.333f,  0.5f,  0.333f,  -0.333f, 0.5f,  0.333f,  0.333f,  0.5f,  -1.0f,  1.0f,    0.5f,  -0.333f, 0.333f,  0.5f,
+        -1.0f,   0.333f,  0.5f,  -1.0f,   -1.0f,   -0.5f, -1.0f,   -1.0f,   0.5f,  0.333f, -0.333f, 0.5f,  0.333f,  -1.0f,   0.5f,
+        1.0f,    -1.0f,   0.5f,  0.333f,  -1.0f,   0.5f,  0.333f,  0.333f,  0.5f,  0.333f, -0.333f, 0.5f,  1.0f,    -0.333f, 0.5f,
+        -0.333f, 0.333f,  0.5f,  -0.333f, -0.333f, 0.5f,  0.333f,  -0.333f, 0.5f,
+    };
+    // clang-format off
+    static constexpr AZStd::array TwoSeparatedPlanesIndices{
+        uint32_t{ 0 }, 1,  2,  3,  4,  5,  2,  6,  3,  7,  8,  9,  10, 5,  8,  11, 10, 7,  12, 3,  10, 13, 12, 11, 14, 2,  12,
+        15,            16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 25, 29, 27, 24, 30, 31, 32, 33, 34, 29, 35, 17, 34,
+        0,             36, 1,  3,  6,  4,  2,  1,  6,  7,  10, 8,  10, 3,  5,  11, 12, 10, 12, 2,  3,  13, 14, 12, 14, 0,  2,
+        15,            37, 16, 38, 39, 40, 17, 16, 41, 24, 27, 25, 42, 43, 44, 29, 34, 27, 45, 46, 47, 33, 35, 34, 35, 15, 17,
+    };
+    // clang-format on
+
+    // Ensure that the index buffer references all the positions in the position buffer
+    static constexpr inline auto minmaxElement = AZStd::minmax_element(begin(TwoSeparatedPlanesIndices), end(TwoSeparatedPlanesIndices));
+    static_assert(*minmaxElement.second == (TwoSeparatedPlanesPositions.size() / 3) - 1);
+
     template<class x> class TD;
-    class TwoSeparatedPlanesMesh
+    class TestMesh
     {
     public:
-        TwoSeparatedPlanesMesh()
+        TestMesh(const float* positions, size_t positionCount, const uint32_t* indices, size_t indicesCount)
         {
-            using namespace AZ;
-
-            RPI::ModelLodAssetCreator lodCreator;
-            lodCreator.Begin(Data::AssetId(AZ::Uuid::CreateRandom()));
+            AZ::RPI::ModelLodAssetCreator lodCreator;
+            lodCreator.Begin(AZ::Data::AssetId(AZ::Uuid::CreateRandom()));
 
             lodCreator.BeginMesh();
-            lodCreator.SetMeshAabb(Aabb::CreateFromMinMax({-1.0f, -1.0f, -0.5f}, {1.0f, 1.0f, 0.5f}));
+            lodCreator.SetMeshAabb(AZ::Aabb::CreateFromMinMax({-1.0f, -1.0f, -0.5f}, {1.0f, 1.0f, 0.5f}));
             lodCreator.SetMeshMaterialAsset(
                 AZ::Data::Asset<AZ::RPI::MaterialAsset>(AZ::Data::AssetId(AZ::Uuid::CreateRandom(), 0),
                     AZ::AzTypeInfo<AZ::RPI::MaterialAsset>::Uuid(), "")
             );
 
             {
-                AZ::Data::Asset<AZ::RPI::BufferAsset> indexBuffer = BuildTestBuffer(s_indexes.size(), sizeof(uint32_t));
-                AZStd::copy(s_indexes.begin(), s_indexes.end(), reinterpret_cast<uint32_t*>(const_cast<uint8_t*>(indexBuffer->GetBuffer().data())));
+                AZ::Data::Asset<AZ::RPI::BufferAsset> indexBuffer = BuildTestBuffer(indicesCount, sizeof(uint32_t));
+                AZStd::copy(indices, indices + indicesCount, reinterpret_cast<uint32_t*>(const_cast<uint8_t*>(indexBuffer->GetBuffer().data())));
                 lodCreator.SetMeshIndexBuffer({
                     indexBuffer,
-                    RHI::BufferViewDescriptor::CreateStructured(0, s_indexes.size(), sizeof(uint32_t))
+                    AZ::RHI::BufferViewDescriptor::CreateStructured(0, indicesCount, sizeof(uint32_t))
                 });
             }
 
             {
-                AZ::Data::Asset<AZ::RPI::BufferAsset> positionBuffer = BuildTestBuffer(s_positions.size() / 3, sizeof(float) * 3);
-                AZStd::copy(s_positions.begin(), s_positions.end(), reinterpret_cast<float*>(const_cast<uint8_t*>(positionBuffer->GetBuffer().data())));
+                AZ::Data::Asset<AZ::RPI::BufferAsset> positionBuffer = BuildTestBuffer(positionCount / 3, sizeof(float) * 3);
+                AZStd::copy(positions, positions + positionCount, reinterpret_cast<float*>(const_cast<uint8_t*>(positionBuffer->GetBuffer().data())));
                 lodCreator.AddMeshStreamBuffer(
                     AZ::RHI::ShaderSemantic(AZ::Name("POSITION")),
                     AZ::Name(),
                     {
                         positionBuffer,
-                        RHI::BufferViewDescriptor::CreateStructured(0, s_positions.size() / 3, sizeof(float) * 3)
+                        AZ::RHI::BufferViewDescriptor::CreateStructured(0, positionCount / 3, sizeof(float) * 3)
                     }
                 );
             }
             lodCreator.EndMesh();
 
-            Data::Asset<RPI::ModelLodAsset> lodAsset;
+            AZ::Data::Asset<AZ::RPI::ModelLodAsset> lodAsset;
             lodCreator.End(lodAsset);
 
-            RPI::ModelAssetCreator modelCreator;
-            modelCreator.Begin(Data::AssetId(AZ::Uuid::CreateRandom()));
+            AZ::RPI::ModelAssetCreator modelCreator;
+            modelCreator.Begin(AZ::Data::AssetId(AZ::Uuid::CreateRandom()));
             modelCreator.SetName("TestModel");
             modelCreator.AddLodAsset(AZStd::move(lodAsset));
             modelCreator.End(m_modelAsset);
@@ -1030,40 +1068,20 @@ namespace UnitTest
 
     private:
         AZ::Data::Asset<AZ::RPI::ModelAsset> m_modelAsset;
-
-        static constexpr AZStd::array s_positions{
-            -1.0f,   -0.333f, -0.5f, -0.333f, -1.0f,   -0.5f, -0.333f, -0.333f, -0.5f, 0.333f, -0.333f, -0.5f, 1.0f,    -1.0f,   -0.5f,
-            1.0f,    -0.333f, -0.5f, 0.333f,  -1.0f,   -0.5f, 0.333f,  1.0f,    -0.5f, 1.0f,   0.333f,  -0.5f, 1.0f,    1.0f,    -0.5f,
-            0.333f,  0.333f,  -0.5f, -0.333f, 1.0f,    -0.5f, -0.333f, 0.333f,  -0.5f, -1.0f,  1.0f,    -0.5f, -1.0f,   0.333f,  -0.5f,
-            -1.0f,   -0.333f, 0.5f,  -0.333f, -1.0f,   0.5f,  -0.333f, -0.333f, 0.5f,  0.333f, -0.333f, 0.5f,  1.0f,    -1.0f,   0.5f,
-            1.0f,    -0.333f, 0.5f,  -0.333f, -0.333f, 0.5f,  0.333f,  -1.0f,   0.5f,  0.333f, -0.333f, 0.5f,  0.333f,  1.0f,    0.5f,
-            1.0f,    0.333f,  0.5f,  1.0f,    1.0f,    0.5f,  0.333f,  0.333f,  0.5f,  1.0f,   -0.333f, 0.5f,  -0.333f, 1.0f,    0.5f,
-            -0.333f, 0.333f,  0.5f,  0.333f,  -0.333f, 0.5f,  0.333f,  0.333f,  0.5f,  -1.0f,  1.0f,    0.5f,  -0.333f, 0.333f,  0.5f,
-            -1.0f,   0.333f,  0.5f,  -1.0f,   -1.0f,   -0.5f, -1.0f,   -1.0f,   0.5f,  0.333f, -0.333f, 0.5f,  0.333f,  -1.0f,   0.5f,
-            1.0f,    -1.0f,   0.5f,  0.333f,  -1.0f,   0.5f,  0.333f,  0.333f,  0.5f,  0.333f, -0.333f, 0.5f,  1.0f,    -0.333f, 0.5f,
-            -0.333f, 0.333f,  0.5f,  -0.333f, -0.333f, 0.5f,  0.333f,  -0.333f, 0.5f,
-        };
-        static constexpr AZStd::array s_indexes{
-            uint32_t{0}, 1,  2,  3,  4,  5,  2,  6,  3,  7,  8,  9,  10, 5,  8,  11, 10, 7,  12, 3,  10, 13, 12, 11, 14, 2,  12,
-            15,          16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 25, 29, 27, 24, 30, 31, 32, 33, 34, 29, 35, 17, 34,
-            0,           36, 1,  3,  6,  4,  2,  1,  6,  7,  10, 8,  10, 3,  5,  11, 12, 10, 12, 2,  3,  13, 14, 12, 14, 0,  2,
-            15,          37, 16, 38, 39, 40, 17, 16, 41, 24, 27, 25, 42, 43, 44, 29, 34, 27, 45, 46, 47, 33, 35, 34, 35, 15, 17,
-        };
-
-        // Ensure that the index buffer references all the positions in the position buffer
-        static constexpr inline auto minmaxElement = AZStd::minmax_element(begin(s_indexes), end(s_indexes));
-        static_assert(*minmaxElement.second == (s_positions.size() / 3) - 1);
     };
 
-    struct KdTreeIntersectParams
+    struct IntersectParams
     {
         float xpos;
         float ypos;
         float zpos;
+        float xdir;
+        float ydir;
+        float zdir;
         float expectedDistance;
         bool expectedShouldIntersect;
 
-        friend std::ostream& operator<<(std::ostream& os, const KdTreeIntersectParams& param)
+        friend std::ostream& operator<<(std::ostream& os, const IntersectParams& param)
         {
             return os
                 << "xpos:" << param.xpos
@@ -1076,13 +1094,15 @@ namespace UnitTest
 
     class KdTreeIntersectsParameterizedFixture
         : public ModelTests
-        , public ::testing::WithParamInterface<KdTreeIntersectParams>
+        , public ::testing::WithParamInterface<IntersectParams>
     {
     };
 
     TEST_P(KdTreeIntersectsParameterizedFixture, KdTreeIntersects)
     {
-        TwoSeparatedPlanesMesh mesh;
+        TestMesh mesh(
+            TwoSeparatedPlanesPositions.data(), TwoSeparatedPlanesPositions.size(), TwoSeparatedPlanesIndices.data(),
+            TwoSeparatedPlanesIndices.size());
 
         AZ::RPI::ModelKdTree kdTree;
         ASSERT_TRUE(kdTree.Build(mesh.GetModel().Get()));
@@ -1092,38 +1112,40 @@ namespace UnitTest
 
         EXPECT_THAT(
             kdTree.RayIntersection(
-                AZ::Vector3(GetParam().xpos, GetParam().ypos, GetParam().zpos), AZ::Vector3::CreateAxisZ(-1.0f), distance, normal),
+                AZ::Vector3(GetParam().xpos, GetParam().ypos, GetParam().zpos),
+                AZ::Vector3(GetParam().xdir, GetParam().ydir, GetParam().zdir), distance, normal),
             testing::Eq(GetParam().expectedShouldIntersect));
         EXPECT_THAT(distance, testing::FloatEq(GetParam().expectedDistance));
     }
 
-    static constexpr inline AZStd::array<KdTreeIntersectParams, 21> intersectTestData{
-        KdTreeIntersectParams{ -0.1f, 0.0f, 1.0f, 0.5f, true },
-        KdTreeIntersectParams{  0.0f, 0.0f, 1.0f, 0.5f, true },
-        KdTreeIntersectParams{  0.1f, 0.0f, 1.0f, 0.5f, true },
+    static constexpr AZStd::array KdTreeIntersectTestData{
+        IntersectParams{ -0.1f, 0.0f, 1.0f, 0.0f, 0.0f, -1.0f, 0.5f, true },
+        IntersectParams{ 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, -1.0f, 0.5f, true },
+        IntersectParams{ 0.1f, 0.0f, 1.0f, 0.0f, 0.0f, -1.0f, 0.5f, true },
 
         // Test the center of each triangle
-        KdTreeIntersectParams{-0.111f, -0.111f, 1.0f, 0.5f, true},
-        KdTreeIntersectParams{-0.111f, -0.778f, 1.0f, 0.5f, true},
-        KdTreeIntersectParams{-0.111f, 0.555f, 1.0f, 0.5f, true}, // Should intersect triangle with indices {29, 34, 27} and {11, 12, 10}
-        KdTreeIntersectParams{-0.555f, -0.555f, 1.0f, 0.5f, true},
-        KdTreeIntersectParams{-0.555f, 0.111f, 1.0f, 0.5f, true},
-        KdTreeIntersectParams{-0.555f, 0.778f, 1.0f, 0.5f, true},
-        KdTreeIntersectParams{-0.778f, -0.111f, 1.0f, 0.5f, true},
-        KdTreeIntersectParams{-0.778f, -0.778f, 1.0f, 0.5f, true},
-        KdTreeIntersectParams{-0.778f, 0.555f, 1.0f, 0.5f, true},
-        KdTreeIntersectParams{0.111f, -0.555f, 1.0f, 0.5f, true},
-        KdTreeIntersectParams{0.111f, 0.111f, 1.0f, 0.5f, true},
-        KdTreeIntersectParams{0.111f, 0.778f, 1.0f, 0.5f, true},
-        KdTreeIntersectParams{0.555f, -0.111f, 1.0f, 0.5f, true},
-        KdTreeIntersectParams{0.555f, -0.778f, 1.0f, 0.5f, true},
-        KdTreeIntersectParams{0.555f, 0.555f, 1.0f, 0.5f, true},
-        KdTreeIntersectParams{0.778f, -0.555f, 1.0f, 0.5f, true},
-        KdTreeIntersectParams{0.778f, 0.111f, 1.0f, 0.5f, true},
-        KdTreeIntersectParams{0.778f, 0.778f, 1.0f, 0.5f, true},
+        IntersectParams{ -0.111f, -0.111f, 1.0f, 0.0f, 0.0f, -1.0f, 0.5f, true },
+        IntersectParams{ -0.111f, -0.778f, 1.0f, 0.0f, 0.0f, -1.0f, 0.5f, true },
+        IntersectParams{ -0.111f, 0.555f, 1.0f, 0.0f, 0.0f, -1.0f, 0.5f,
+                         true }, // Should intersect triangle with indices {29, 34, 27} and {11, 12, 10}
+        IntersectParams{ -0.555f, -0.555f, 1.0f, 0.0f, 0.0f, -1.0f, 0.5f, true },
+        IntersectParams{ -0.555f, 0.111f, 1.0f, 0.0f, 0.0f, -1.0f, 0.5f, true },
+        IntersectParams{ -0.555f, 0.778f, 1.0f, 0.0f, 0.0f, -1.0f, 0.5f, true },
+        IntersectParams{ -0.778f, -0.111f, 1.0f, 0.0f, 0.0f, -1.0f, 0.5f, true },
+        IntersectParams{ -0.778f, -0.778f, 1.0f, 0.0f, 0.0f, -1.0f, 0.5f, true },
+        IntersectParams{ -0.778f, 0.555f, 1.0f, 0.0f, 0.0f, -1.0f, 0.5f, true },
+        IntersectParams{ 0.111f, -0.555f, 1.0f, 0.0f, 0.0f, -1.0f, 0.5f, true },
+        IntersectParams{ 0.111f, 0.111f, 1.0f, 0.0f, 0.0f, -1.0f, 0.5f, true },
+        IntersectParams{ 0.111f, 0.778f, 1.0f, 0.0f, 0.0f, -1.0f, 0.5f, true },
+        IntersectParams{ 0.555f, -0.111f, 1.0f, 0.0f, 0.0f, -1.0f, 0.5f, true },
+        IntersectParams{ 0.555f, -0.778f, 1.0f, 0.0f, 0.0f, -1.0f, 0.5f, true },
+        IntersectParams{ 0.555f, 0.555f, 1.0f, 0.0f, 0.0f, -1.0f, 0.5f, true },
+        IntersectParams{ 0.778f, -0.555f, 1.0f, 0.0f, 0.0f, -1.0f, 0.5f, true },
+        IntersectParams{ 0.778f, 0.111f, 1.0f, 0.0f, 0.0f, -1.0f, 0.5f, true },
+        IntersectParams{ 0.778f, 0.778f, 1.0f, 0.0f, 0.0f, -1.0f, 0.5f, true },
     };
 
-    INSTANTIATE_TEST_CASE_P(KdTreeIntersectsPlane, KdTreeIntersectsParameterizedFixture, ::testing::ValuesIn(intersectTestData));
+    INSTANTIATE_TEST_CASE_P(KdTreeIntersectsPlane, KdTreeIntersectsParameterizedFixture, ::testing::ValuesIn(KdTreeIntersectTestData));
 
     class KdTreeIntersectsFixture
         : public ModelTests
@@ -1133,7 +1155,10 @@ namespace UnitTest
         {
             ModelTests::SetUp();
 
-            m_mesh = AZStd::make_unique<TwoSeparatedPlanesMesh>();
+            m_mesh = AZStd::make_unique<TestMesh>(
+                TwoSeparatedPlanesPositions.data(), TwoSeparatedPlanesPositions.size(), TwoSeparatedPlanesIndices.data(),
+                TwoSeparatedPlanesIndices.size());
+
             m_kdTree = AZStd::make_unique<AZ::RPI::ModelKdTree>();
             ASSERT_TRUE(m_kdTree->Build(m_mesh->GetModel().Get()));
         }
@@ -1146,7 +1171,7 @@ namespace UnitTest
             ModelTests::TearDown();
         }
 
-        AZStd::unique_ptr<TwoSeparatedPlanesMesh> m_mesh;
+        AZStd::unique_ptr<TestMesh> m_mesh;
         AZStd::unique_ptr<AZ::RPI::ModelKdTree> m_kdTree;
     };
 
@@ -1154,7 +1179,7 @@ namespace UnitTest
     {
         float t = AZStd::numeric_limits<float>::max();
         AZ::Vector3 normal;
-         
+
         constexpr float rayLength = 100.0f;
         EXPECT_THAT(
             m_kdTree->RayIntersection(
@@ -1181,4 +1206,85 @@ namespace UnitTest
         EXPECT_THAT(
             m_kdTree->RayIntersection(AZ::Vector3::CreateAxisZ(5.0f), -AZ::Vector3::CreateAxisZ(), t, normal), testing::Eq(false));
     }
+
+    class BruteForceIntersectsParameterizedFixture
+        : public ModelTests
+        , public ::testing::WithParamInterface<IntersectParams>
+    {
+    };
+
+    TEST_P(BruteForceIntersectsParameterizedFixture, BruteForceIntersectsCube)
+    {
+        TestMesh mesh(CubePositions.data(), CubePositions.size(), CubeIndices.data(), CubeIndices.size());
+
+        float distance = AZStd::numeric_limits<float>::max();
+        AZ::Vector3 normal;
+
+        EXPECT_THAT(
+            mesh.GetModel()->LocalRayIntersectionAgainstModel(
+                AZ::Vector3(GetParam().xpos, GetParam().ypos, GetParam().zpos),
+                AZ::Vector3(GetParam().xdir, GetParam().ydir, GetParam().zdir), distance, normal),
+            testing::Eq(GetParam().expectedShouldIntersect));
+        EXPECT_THAT(distance, testing::FloatEq(GetParam().expectedDistance));
+    }
+
+    static constexpr AZStd::array BruteForceIntersectTestData{
+        IntersectParams{ 5.0f, 0.0f, 5.0f, 0.0f, 0.0f, -1.0f, AZStd::numeric_limits<float>::max(), false },
+        IntersectParams{ 0.0f, 0.0f, 1.5f, 0.0f, 0.0f, -1.0f, 0.5f, true },
+        IntersectParams{ 5.0f, 0.0f, 0.0f, -10.0f, 0.0f, 0.0f, 0.4f, true },
+        IntersectParams{ -5.0f, 0.0f, 0.0f, 20.0f, 0.0f, 0.0f, 0.2f, true },
+        IntersectParams{ 0.0f, -10.0f, 0.0f, 0.0f, 20.0f, 0.0f, 0.45f, true },
+        IntersectParams{ 0.0f,  20.0f, 0.0f, 0.0f, -40.0f, 0.0f, 0.475f, true },
+        IntersectParams{ 0.0f,  20.0f, 0.0f, 0.0f, -19.0f, 0.0f, 1.0f, true },
+    };
+
+    INSTANTIATE_TEST_CASE_P(
+        BruteForceIntersects, BruteForceIntersectsParameterizedFixture, ::testing::ValuesIn(BruteForceIntersectTestData));
+
+    class BruteForceModelIntersectsFixture
+        : public ModelTests
+    {
+    public:
+        void SetUp() override
+        {
+            ModelTests::SetUp();
+            m_mesh = AZStd::make_unique<TestMesh>(CubePositions.data(), CubePositions.size(), CubeIndices.data(), CubeIndices.size());
+        }
+
+        void TearDown() override
+        {
+            m_mesh.reset();
+            ModelTests::TearDown();
+        }
+
+        AZStd::unique_ptr<TestMesh> m_mesh;
+    };
+
+    TEST_F(BruteForceModelIntersectsFixture, BruteForceIntersectionDetectedWithCube)
+    {
+        float t = 0.0f;
+        AZ::Vector3 normal;
+
+        // firing down the negative z axis, positioned 5 units from cube (cube is 2x2x2 so intersection
+        // happens at 1 in z)
+        EXPECT_THAT(
+            m_mesh->GetModel()->LocalRayIntersectionAgainstModel(
+                AZ::Vector3::CreateAxisZ(5.0f), -AZ::Vector3::CreateAxisZ(10.0f), t, normal),
+            testing::Eq(true));
+        EXPECT_THAT(t, testing::FloatEq(0.4f));
+    }
+
+    TEST_F(BruteForceModelIntersectsFixture, BruteForceIntersectionDetectedAndNormalSetAtEndOfRay)
+    {
+        float t = 0.0f;
+        AZ::Vector3 normal = AZ::Vector3::CreateOne(); // invalid starting normal
+
+        // ensure the intersection happens right at the end of the ray
+        EXPECT_THAT(
+            m_mesh->GetModel()->LocalRayIntersectionAgainstModel(
+                AZ::Vector3::CreateAxisY(10.0f), -AZ::Vector3::CreateAxisY(9.0f), t, normal),
+            testing::Eq(true));
+        EXPECT_THAT(t, testing::FloatEq(1.0f));
+        EXPECT_THAT(normal, IsClose(AZ::Vector3::CreateAxisY()));
+    }
 } // namespace UnitTest
diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditor.qss b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditor.qss
index e518d80740..506c5a2952 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditor.qss
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditor.qss
@@ -11,8 +11,8 @@
 */
 
 /* Style for visualizing property values overridden from their prefab values */
-AzToolsFramework--PropertyRowWidget[IsOverridden=true] QLabel
+AzToolsFramework--PropertyRowWidget[IsOverridden="true"] QLabel
 {
     font-weight: bold;
-    color: #F5A623;
+    color: #1E70EB;
 }
diff --git a/Gems/AtomContent/LookDevelopmentStudioPixar/Assets/Materials/baseboards.material b/Gems/AtomContent/LookDevelopmentStudioPixar/Assets/Materials/baseboards.material
index f75490c2ad..dee6ded191 100644
--- a/Gems/AtomContent/LookDevelopmentStudioPixar/Assets/Materials/baseboards.material
+++ b/Gems/AtomContent/LookDevelopmentStudioPixar/Assets/Materials/baseboards.material
@@ -37,9 +37,6 @@
             "factor": 0.4343433976173401,
             "textureMap": "Materials/Bricks038_8K/Bricks038_8K_Roughness.png",
             "useTexture": false
-        },
-        "subsurfaceScattering": {
-            "useThicknessMap": false
         }
     }
 }
diff --git a/Gems/AtomContent/LookDevelopmentStudioPixar/Assets/Objects/Lighthead_lightfacingemissive.material b/Gems/AtomContent/LookDevelopmentStudioPixar/Assets/Objects/Lighthead_lightfacingemissive.material
index 21cb12a82c..ddc298a08b 100644
--- a/Gems/AtomContent/LookDevelopmentStudioPixar/Assets/Objects/Lighthead_lightfacingemissive.material
+++ b/Gems/AtomContent/LookDevelopmentStudioPixar/Assets/Objects/Lighthead_lightfacingemissive.material
@@ -18,15 +18,6 @@
         },
         "opacity": {
             "factor": 1.0
-        },
-        "subsurfaceScattering": {
-            "enableSubsurfaceScattering": true,
-            "quality": 1.0,
-            "scatterDistance": 2.626262664794922,
-            "subsurfaceScatterFactor": 1.0,
-            "thickness": 0.1414141058921814,
-            "transmissionMode": "ThinObject",
-            "transmissionScale": 1.8181817531585694
         }
     }
 }
diff --git a/Gems/AtomContent/LookDevelopmentStudioPixar/Assets/Objects/PlayfulTeapot_playfulteapot.material b/Gems/AtomContent/LookDevelopmentStudioPixar/Assets/Objects/PlayfulTeapot_playfulteapot.material
index b46dd709b1..27540c587e 100644
--- a/Gems/AtomContent/LookDevelopmentStudioPixar/Assets/Objects/PlayfulTeapot_playfulteapot.material
+++ b/Gems/AtomContent/LookDevelopmentStudioPixar/Assets/Objects/PlayfulTeapot_playfulteapot.material
@@ -31,18 +31,6 @@
         },
         "roughness": {
             "factor": 0.0
-        },
-        "subsurfaceScattering": {
-            "enableSubsurfaceScattering": true,
-            "quality": 1.0,
-            "scatterColor": [
-                0.045288778841495517,
-                0.24347294867038728,
-                0.2060578316450119,
-                1.0
-            ],
-            "scatterDistance": 4.040403842926025,
-            "subsurfaceScatterFactor": 0.5
         }
     }
 }
diff --git a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Copper/copper.material b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Copper/copper.material
index 4489e12c4d..80b7ea29f3 100644
--- a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Copper/copper.material
+++ b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Copper/copper.material
@@ -20,11 +20,6 @@
         },
         "roughness": {
             "factor": 0.20202019810676576
-        },
-        "subsurfaceScattering": {
-            "quality": 0.329292893409729,
-            "scatterDistance": 6.666666507720947,
-            "subsurfaceScatterFactor": 0.9595959782600403
         }
     }
 }
diff --git a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Plaster/plaster.material b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Plaster/plaster.material
index 3121fdac24..cdf76f612d 100644
--- a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Plaster/plaster.material
+++ b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Plaster/plaster.material
@@ -28,17 +28,6 @@
         },
         "specularF0": {
             "factor": 1.0
-        },
-        "subsurfaceScattering": {
-            "quality": 0.9838383793830872,
-            "scatterColor": [
-                0.143602654337883,
-                0.012634470127522946,
-                0.0005798428319394589,
-                1.0
-            ],
-            "scatterDistance": 18.383838653564454,
-            "subsurfaceScatterFactor": 0.1414141058921814
         }
     }
 }
diff --git a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Plastic_01/plastic_01.material b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Plastic_01/plastic_01.material
index e953d04238..227017e1ab 100644
--- a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Plastic_01/plastic_01.material
+++ b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Plastic_01/plastic_01.material
@@ -25,17 +25,6 @@
         },
         "specularF0": {
             "factor": 1.0
-        },
-        "subsurfaceScattering": {
-            "quality": 0.9838383793830872,
-            "scatterColor": [
-                0.143602654337883,
-                0.012634470127522946,
-                0.0005798428319394589,
-                1.0
-            ],
-            "scatterDistance": 18.383838653564454,
-            "subsurfaceScatterFactor": 0.1414141058921814
         }
     }
 }
diff --git a/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_ceiling.material b/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_ceiling.material
index 95d08d398b..88730c9556 100644
--- a/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_ceiling.material
+++ b/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_ceiling.material
@@ -4,20 +4,15 @@
     "parentMaterial": "",
     "propertyLayoutVersion": 3,
     "properties": {
-        "occlusion": {
-            "diffuseTextureMap": "Textures/ceiling_1k_ao.png"
-        },
         "baseColor": {
-            "textureBlendMode": "Lerp",
+            "color": [
+                0.800000011920929,
+                0.800000011920929,
+                0.800000011920929,
+                1.0
+            ],
             "textureMap": "Textures/ceiling_1k_basecolor.png"
         },
-        "clearCoat": {
-            "enable": true,
-            "factor": 0.5,
-            "influenceMap": "Textures/ceiling_1k_ao.png",
-            "normalMap": "Textures/ceiling_1k_normal.png",
-            "roughness": 0.30000001192092898
-        },
         "emissive": {
             "color": [
                 0.0,
@@ -26,33 +21,8 @@
                 1.0
             ]
         },
-        "general": {
-            "applySpecularAA": true
-        },
-        "irradiance": {
-            "color": [
-                1.0,
-                0.7591058015823364,
-                0.43776607513427737,
-                1.0
-            ]
-        },
-        "normal": {
-            "textureMap": "Textures/ceiling_1k_normal.png"
-        },
         "opacity": {
             "factor": 1.0
-        },
-        "parallax": {
-            "algorithm": "ContactRefinement",
-            "factor": 0.019999999552965165,
-            "pdo": true,
-            "quality": "Medium",
-            "textureMap": "Textures/ceiling_1k_height.png",
-            "useTexture": false
-        },
-        "roughness": {
-            "textureMap": "Textures/ceiling_1k_roughness.png"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_chain.material b/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_chain.material
index 223bd0a24f..1ed442a9e0 100644
--- a/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_chain.material
+++ b/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_chain.material
@@ -13,31 +13,16 @@
             ],
             "textureMap": "Textures/chain_basecolor.png"
         },
-        "general": {
-            "applySpecularAA": true
-        },
-        "irradiance": {
+        "emissive": {
             "color": [
-                0.4891279339790344,
-                0.7931944727897644,
-                1.0,
+                0.0,
+                0.0,
+                0.0,
                 1.0
             ]
         },
-        "metallic": {
-            "textureMap": "Textures/chain_alpha.png"
-        },
-        "normal": {
-            "textureMap": "Textures/chain_normal.jpg"
-        },
         "opacity": {
-            "alphaSource": "Split",
-            "factor": 0.30000001192092898,
-            "mode": "Cutout",
-            "textureMap": "Textures/chain_alpha.png"
-        },
-        "roughness": {
-            "factor": 0.4000000059604645
+            "factor": 1.0
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_leaf.material b/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_leaf.material
index ac326ae935..c95d0a662b 100644
--- a/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_leaf.material
+++ b/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_leaf.material
@@ -47,25 +47,6 @@
         },
         "roughness": {
             "textureMap": "Textures/thorn_roughness.png"
-        },
-        "subsurfaceScattering": {
-            "enableSubsurfaceScattering": true,
-            "quality": 1.0,
-            "scatterColor": [
-                0.28143739700317385,
-                1.0,
-                0.13000686466693879,
-                1.0
-            ],
-            "scatterDistance": 1.0,
-            "thickness": 0.10000000149011612,
-            "transmissionMode": "ThinObject",
-            "transmissionTint": [
-                0.07225146889686585,
-                0.16981765627861024,
-                0.04444953054189682,
-                1.0
-            ]
         }
     }
 }
diff --git a/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_lion.material b/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_lion.material
index b1f78aa33f..08eb920607 100644
--- a/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_lion.material
+++ b/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_lion.material
@@ -4,9 +4,6 @@
     "parentMaterial": "",
     "propertyLayoutVersion": 3,
     "properties": {
-        "occlusion": {
-            "diffuseTextureMap": "Textures/lion_1k_ao.png"
-        },
         "baseColor": {
             "color": [
                 0.800000011920929,
@@ -16,38 +13,16 @@
             ],
             "textureMap": "Textures/lion_1k_basecolor.png"
         },
-        "general": {
-            "applySpecularAA": true
-        },
-        "irradiance": {
+        "emissive": {
             "color": [
-                1.0,
-                0.7364919781684876,
-                0.3672388792037964,
+                0.0,
+                0.0,
+                0.0,
                 1.0
             ]
         },
-        "metallic": {
-            "textureMap": "Textures/lion_1k_metallic.png"
-        },
-        "normal": {
-            "textureMap": "Textures/lion_1k_normal.jpg"
-        },
         "opacity": {
             "factor": 1.0
-        },
-        "parallax": {
-            "algorithm": "ContactRefinement",
-            "factor": 0.009999999776482582,
-            "pdo": true,
-            "quality": "Ultra",
-            "textureMap": "Textures/lion_1k_height.png"
-        },
-        "roughness": {
-            "textureMap": "Textures/lion_1k_roughness.png"
-        },
-        "specularF0": {
-            "enableMultiScatterCompensation": true
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_vaseplant.material b/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_vaseplant.material
index 37d9e2c01c..290ddc81a6 100644
--- a/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_vaseplant.material
+++ b/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_vaseplant.material
@@ -28,24 +28,6 @@
             "doubleSided": true,
             "factor": 0.28999999165534975,
             "mode": "Cutout"
-        },
-        "subsurfaceScattering": {
-            "enableSubsurfaceScattering": true,
-            "quality": 1.0,
-            "scatterColor": [
-                0.07421988248825073,
-                0.10223544389009476,
-                0.0,
-                1.0
-            ],
-            "subsurfaceScatterFactor": 0.0,
-            "transmissionMode": "ThinObject",
-            "transmissionTint": [
-                0.33716335892677309,
-                0.4620737135410309,
-                0.0,
-                1.0
-            ]
         }
     }
 }
diff --git a/Gems/AtomLyIntegration/AtomFont/Code/Source/AtomFont_precompiled.cpp b/Gems/AtomLyIntegration/AtomFont/Code/Source/AtomFont_precompiled.cpp
deleted file mode 100644
index 63f8a2bddb..0000000000
--- a/Gems/AtomLyIntegration/AtomFont/Code/Source/AtomFont_precompiled.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include <AtomLyIntegration/AtomFont/AtomFont_precompiled.h>
diff --git a/Gems/AtomLyIntegration/AtomFont/Code/atomfont_files.cmake b/Gems/AtomLyIntegration/AtomFont/Code/atomfont_files.cmake
index d2b76a2d79..533fe9e527 100644
--- a/Gems/AtomLyIntegration/AtomFont/Code/atomfont_files.cmake
+++ b/Gems/AtomLyIntegration/AtomFont/Code/atomfont_files.cmake
@@ -33,5 +33,4 @@ set(FILES
     Include/AtomLyIntegration/AtomFont/AtomNullFont.h
     Include/AtomLyIntegration/AtomFont/resource.h
     Include/AtomLyIntegration/AtomFont/AtomFont_precompiled.h
-    Source/AtomFont_precompiled.cpp
 )
diff --git a/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/AtomActorInstance.cpp b/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/AtomActorInstance.cpp
index 9079f639ba..532c8720b5 100644
--- a/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/AtomActorInstance.cpp
+++ b/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/AtomActorInstance.cpp
@@ -18,6 +18,7 @@
 #include <Integration/System/SystemCommon.h>
 #include <Integration/System/SystemComponent.h>
 #include <EMotionFX/Source/ActorInstance.h>
+#include <EMotionFX/Source/DebugDraw.h>
 #include <EMotionFX/Source/MorphSetup.h>
 #include <EMotionFX/Source/MorphSetupInstance.h>
 #include <EMotionFX/Source/MorphTargetStandard.h>
@@ -27,6 +28,8 @@
 #include <EMotionFX/Source/Node.h>
 #include <MCore/Source/AzCoreConversions.h>
 
+#include <Atom/RPI.Public/AuxGeom/AuxGeomDraw.h>
+#include <Atom/RPI.Public/AuxGeom/AuxGeomFeatureProcessorInterface.h>
 #include <Atom/RPI.Public/Scene.h>
 #include <Atom/RPI.Public/Image/StreamingImage.h>
 
@@ -57,6 +60,8 @@ namespace AZ
                 Activate();
                 AzFramework::BoundsRequestBus::Handler::BusConnect(m_entityId);
             }
+
+            m_auxGeomFeatureProcessor = RPI::Scene::GetFeatureProcessorForEntity<RPI::AuxGeomFeatureProcessorInterface>(m_entityId);
         }
 
         AtomActorInstance::~AtomActorInstance()
@@ -88,7 +93,119 @@ namespace AZ
             AZ::Interface<AzFramework::IEntityBoundsUnion>::Get()->RefreshEntityLocalBoundsUnion(m_entityId);
         }
 
-        AZ::Aabb AtomActorInstance:: GetWorldBounds()
+        void AtomActorInstance::DebugDraw(const DebugOptions& debugOptions)
+        {
+            if (m_auxGeomFeatureProcessor)
+            {
+                if (RPI::AuxGeomDrawPtr auxGeom = m_auxGeomFeatureProcessor->GetDrawQueue())
+                {
+                    if (debugOptions.m_drawAABB)
+                    {
+                        const MCore::AABB emfxAabb = m_actorInstance->GetAABB();
+                        const AZ::Aabb azAabb = AZ::Aabb::CreateFromMinMax(emfxAabb.GetMin(), emfxAabb.GetMax());
+                        auxGeom->DrawAabb(azAabb, AZ::Color(0.0f, 1.0f, 1.0f, 1.0f), RPI::AuxGeomDraw::DrawStyle::Line);
+                    }
+
+                    if (debugOptions.m_drawSkeleton)
+                    {
+                        RenderSkeleton(auxGeom.get());
+                    }
+
+                    if (debugOptions.m_emfxDebugDraw)
+                    {
+                        RenderEMFXDebugDraw(auxGeom.get());
+                    }
+                }
+            }
+        }
+
+        void AtomActorInstance::RenderSkeleton(RPI::AuxGeomDraw* auxGeom)
+        {
+            AZ_Assert(m_actorInstance, "Valid actor instance required.");
+            const EMotionFX::TransformData* transformData = m_actorInstance->GetTransformData();
+            const EMotionFX::Skeleton* skeleton = m_actorInstance->GetActor()->GetSkeleton();
+            const EMotionFX::Pose* pose = transformData->GetCurrentPose();
+
+            const AZ::u32 transformCount = transformData->GetNumTransforms();
+            const AZ::u32 lodLevel = m_actorInstance->GetLODLevel();
+            const AZ::u32 numJoints = skeleton->GetNumNodes();
+
+            m_auxVertices.clear();
+            m_auxVertices.reserve(numJoints * 2);
+
+            for (AZ::u32 jointIndex = 0; jointIndex < numJoints; ++jointIndex)
+            {
+                const EMotionFX::Node* joint = skeleton->GetNode(jointIndex);
+                if (!joint->GetSkeletalLODStatus(lodLevel))
+                {
+                    continue;
+                }
+
+                const AZ::u32 parentIndex = joint->GetParentIndex();
+                if (parentIndex == InvalidIndex32)
+                {
+                    continue;
+                }
+
+                const AZ::Vector3 parentPos = pose->GetWorldSpaceTransform(parentIndex).mPosition;
+                m_auxVertices.emplace_back(parentPos);
+
+                const AZ::Vector3 bonePos = pose->GetWorldSpaceTransform(jointIndex).mPosition;
+                m_auxVertices.emplace_back(bonePos);
+            }
+
+            const AZ::Color skeletonColor(0.604f, 0.804f, 0.196f, 1.0f);
+            RPI::AuxGeomDraw::AuxGeomDynamicDrawArguments lineArgs;
+            lineArgs.m_verts = m_auxVertices.data();
+            lineArgs.m_vertCount = m_auxVertices.size();
+            lineArgs.m_colors = &skeletonColor;
+            lineArgs.m_colorCount = 1;
+            lineArgs.m_depthTest = RPI::AuxGeomDraw::DepthTest::Off;
+            auxGeom->DrawLines(lineArgs);
+        }
+
+        void AtomActorInstance::RenderEMFXDebugDraw(RPI::AuxGeomDraw* auxGeom)
+        {
+            EMotionFX::DebugDraw& debugDraw = EMotionFX::GetDebugDraw();
+            debugDraw.Lock();
+            EMotionFX::DebugDraw::ActorInstanceData* actorInstanceData = debugDraw.GetActorInstanceData(m_actorInstance);
+            actorInstanceData->Lock();
+            const AZStd::vector<EMotionFX::DebugDraw::Line>& lines = actorInstanceData->GetLines();
+            if (lines.empty())
+            {
+                actorInstanceData->Unlock();
+                debugDraw.Unlock();
+                return;
+            }
+
+            m_auxVertices.clear();
+            m_auxVertices.reserve(lines.size() * 2);
+            m_auxColors.clear();
+            m_auxColors.reserve(m_auxVertices.size());
+
+            for (const EMotionFX::DebugDraw::Line& line : actorInstanceData->GetLines())
+            {
+                m_auxVertices.emplace_back(line.m_start);
+                m_auxColors.emplace_back(line.m_startColor);
+                m_auxVertices.emplace_back(line.m_end);
+                m_auxColors.emplace_back(line.m_endColor);
+            }
+
+            AZ_Assert(m_auxVertices.size() == m_auxColors.size(),
+                "Number of vertices and number of colors need to match.");
+            actorInstanceData->Unlock();
+            debugDraw.Unlock();
+
+            RPI::AuxGeomDraw::AuxGeomDynamicDrawArguments lineArgs;
+            lineArgs.m_verts = m_auxVertices.data();
+            lineArgs.m_vertCount = m_auxVertices.size();
+            lineArgs.m_colors = m_auxColors.data();
+            lineArgs.m_colorCount = m_auxColors.size();
+            lineArgs.m_depthTest = RPI::AuxGeomDraw::DepthTest::Off;
+            auxGeom->DrawLines(lineArgs);
+        }
+
+        AZ::Aabb AtomActorInstance::GetWorldBounds()
         {
             return m_worldAABB;
         }
diff --git a/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/AtomActorInstance.h b/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/AtomActorInstance.h
index e05280e896..98e47e7128 100644
--- a/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/AtomActorInstance.h
+++ b/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/AtomActorInstance.h
@@ -42,6 +42,8 @@ namespace EMotionFX
 }
 namespace AZ::RPI
 {
+    class AuxGeomDraw;
+    class AuxGeomFeatureProcessorInterface;
     class Model;
     class Buffer;
     class StreamingImage;
@@ -89,7 +91,7 @@ namespace AZ
             // RenderActorInstance overrides ...
             void OnTick(float timeDelta) override;
             void UpdateBounds() override;
-            void DebugDraw(const DebugOptions& debugOptions) override { AZ_UNUSED(debugOptions) };
+            void DebugDraw(const DebugOptions& debugOptions) override;
             void SetMaterials(const EMotionFX::Integration::ActorAsset::MaterialList& materialPerLOD) override { AZ_UNUSED(materialPerLOD); };
             void SetSkinningMethod(EMotionFX::Integration::SkinningMethod emfxSkinningMethod);
             SkinningMethod GetAtomSkinningMethod() const;
@@ -177,6 +179,13 @@ namespace AZ
             void InitWrinkleMasks();
             void UpdateWrinkleMasks();
 
+            // Helper and debug geometry rendering
+            void RenderSkeleton(RPI::AuxGeomDraw* auxGeom);
+            void RenderEMFXDebugDraw(RPI::AuxGeomDraw* auxGeom);
+            RPI::AuxGeomFeatureProcessorInterface* m_auxGeomFeatureProcessor = nullptr;
+            AZStd::vector<AZ::Vector3> m_auxVertices;
+            AZStd::vector<AZ::Color> m_auxColors;
+
             AZStd::intrusive_ptr<AZ::Render::SkinnedMeshInputBuffers> m_skinnedMeshInputBuffers = nullptr;
             AZStd::intrusive_ptr<SkinnedMeshInstance> m_skinnedMeshInstance;
             AZ::Data::Instance<AZ::RPI::Buffer> m_boneTransforms = nullptr;
diff --git a/Gems/Camera/Code/Source/Camera_precompiled.cpp b/Gems/Camera/Code/Source/Camera_precompiled.cpp
deleted file mode 100644
index a305cdc9df..0000000000
--- a/Gems/Camera/Code/Source/Camera_precompiled.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#include "Camera_precompiled.h"
diff --git a/Gems/Camera/Code/camera_files.cmake b/Gems/Camera/Code/camera_files.cmake
index f8bf93d66d..43f29435c5 100644
--- a/Gems/Camera/Code/camera_files.cmake
+++ b/Gems/Camera/Code/camera_files.cmake
@@ -16,6 +16,5 @@ set(FILES camera_files.cmake
     Source/CameraComponentController.cpp
     Source/CameraComponentController.h
     Source/CameraViewRegistrationBus.h
-    Source/Camera_precompiled.cpp
     Source/Camera_precompiled.h
 )
diff --git a/Gems/CameraFramework/Code/Source/CameraFramework_precompiled.cpp b/Gems/CameraFramework/Code/Source/CameraFramework_precompiled.cpp
deleted file mode 100644
index e5c5926821..0000000000
--- a/Gems/CameraFramework/Code/Source/CameraFramework_precompiled.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#include "CameraFramework_precompiled.h"
diff --git a/Gems/CameraFramework/Code/cameraframework_files.cmake b/Gems/CameraFramework/Code/cameraframework_files.cmake
index f6571f1689..c62e7d6455 100644
--- a/Gems/CameraFramework/Code/cameraframework_files.cmake
+++ b/Gems/CameraFramework/Code/cameraframework_files.cmake
@@ -16,6 +16,5 @@ set(FILES
     Include/CameraFramework/ICameraTransformBehavior.h
     Source/CameraRigComponent.h
     Source/CameraRigComponent.cpp
-    Source/CameraFramework_precompiled.cpp
     Source/CameraFramework_precompiled.h
 )
diff --git a/Gems/DebugDraw/Code/Source/DebugDraw_precompiled.cpp b/Gems/DebugDraw/Code/Source/DebugDraw_precompiled.cpp
deleted file mode 100644
index d5601bd1c0..0000000000
--- a/Gems/DebugDraw/Code/Source/DebugDraw_precompiled.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include "DebugDraw_precompiled.h"
diff --git a/Gems/DebugDraw/Code/debugdraw_editor_files.cmake b/Gems/DebugDraw/Code/debugdraw_editor_files.cmake
index a5adb2faac..da5e2c0870 100644
--- a/Gems/DebugDraw/Code/debugdraw_editor_files.cmake
+++ b/Gems/DebugDraw/Code/debugdraw_editor_files.cmake
@@ -10,7 +10,6 @@
 #
 
 set(FILES
-    Source/DebugDraw_precompiled.cpp
     Source/DebugDraw_precompiled.h
     Include/DebugDraw/DebugDrawBus.h
     Source/DebugDrawModule.cpp
diff --git a/Gems/DebugDraw/Code/debugdraw_files.cmake b/Gems/DebugDraw/Code/debugdraw_files.cmake
index 4e0b115f1b..bc53fd1d26 100644
--- a/Gems/DebugDraw/Code/debugdraw_files.cmake
+++ b/Gems/DebugDraw/Code/debugdraw_files.cmake
@@ -10,7 +10,6 @@
 #
 
 set(FILES
-    Source/DebugDraw_precompiled.cpp
     Source/DebugDraw_precompiled.h
     Include/DebugDraw/DebugDrawBus.h
     Source/DebugDrawLineComponent.cpp
diff --git a/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/GLExtensions.h b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/GLExtensions.h
index 731641f6aa..78ffa4ecda 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/GLExtensions.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/GLExtensions.h
@@ -12,6 +12,7 @@
 
 #pragma once
 
+#include <AzCore/PlatformIncl.h>
 #include <QOpenGLFunctions>
 
 QT_FORWARD_DECLARE_CLASS(QOpenGLContext);
diff --git a/Gems/EMotionFX/Code/Source/EMotionFX_precompiled.cpp b/Gems/EMotionFX/Code/Source/EMotionFX_precompiled.cpp
deleted file mode 100644
index c827107a59..0000000000
--- a/Gems/EMotionFX/Code/Source/EMotionFX_precompiled.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-
-#include "EMotionFX_precompiled.h"
diff --git a/Gems/EMotionFX/Code/Source/Integration/Components/ActorComponent.cpp b/Gems/EMotionFX/Code/Source/Integration/Components/ActorComponent.cpp
index f41ef165c8..b0065708fb 100644
--- a/Gems/EMotionFX/Code/Source/Integration/Components/ActorComponent.cpp
+++ b/Gems/EMotionFX/Code/Source/Integration/Components/ActorComponent.cpp
@@ -299,8 +299,7 @@ namespace EMotionFX
         void ActorComponent::OnAssetReady(AZ::Data::Asset<AZ::Data::AssetData> asset)
         {
             m_configuration.m_actorAsset = asset;
-            Actor* actor = m_configuration.m_actorAsset->GetActor();
-            AZ_Assert(m_configuration.m_actorAsset.IsReady() && actor, "Actor asset should be loaded and actor valid.");
+            AZ_Assert(m_configuration.m_actorAsset.IsReady() && m_configuration.m_actorAsset->GetActor(), "Actor asset should be loaded and actor valid.");
 
             CheckActorCreation();
         }
diff --git a/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorActorComponent.cpp b/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorActorComponent.cpp
index 7d5b7ade00..5c085e96f7 100644
--- a/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorActorComponent.cpp
+++ b/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorActorComponent.cpp
@@ -435,19 +435,17 @@ namespace EMotionFX
 
         void EditorActorComponent::LaunchAnimationEditor(const AZ::Data::AssetId& assetId, const AZ::Data::AssetType&)
         {
+            // call to open must be done before LoadCharacter
+            const char* panelName = EMStudio::MainWindow::GetEMotionFXPaneName();
+            EBUS_EVENT(AzToolsFramework::EditorRequests::Bus, OpenViewPane, panelName);
+
             if (assetId.IsValid())
             {
                 AZ::Data::AssetId animgraphAssetId;
-                animgraphAssetId.SetInvalid();
                 EditorAnimGraphComponentRequestBus::EventResult(animgraphAssetId, GetEntityId(), &EditorAnimGraphComponentRequestBus::Events::GetAnimGraphAssetId);
                 AZ::Data::AssetId motionSetAssetId;
-                motionSetAssetId.SetInvalid();
                 EditorAnimGraphComponentRequestBus::EventResult(motionSetAssetId, GetEntityId(), &EditorAnimGraphComponentRequestBus::Events::GetMotionSetAssetId);
 
-                // call to open must be done before LoadCharacter
-                const char* panelName = EMStudio::MainWindow::GetEMotionFXPaneName();
-                EBUS_EVENT(AzToolsFramework::EditorRequests::Bus, OpenViewPane, panelName);
-
                 EMStudio::MainWindow* mainWindow = EMStudio::GetMainWindow();
                 if (mainWindow)
                 {
@@ -555,6 +553,7 @@ namespace EMotionFX
                 RenderActorInstance::DebugOptions debugOptions;
                 debugOptions.m_drawAABB = m_renderBounds;
                 debugOptions.m_drawSkeleton = m_renderSkeleton;
+                debugOptions.m_emfxDebugDraw = true;
                 m_renderActorInstance->DebugDraw(debugOptions);
             }
         }
diff --git a/Gems/EMotionFX/Code/emotionfx_editor_files.cmake b/Gems/EMotionFX/Code/emotionfx_editor_files.cmake
index d8216822d4..8d88013e39 100644
--- a/Gems/EMotionFX/Code/emotionfx_editor_files.cmake
+++ b/Gems/EMotionFX/Code/emotionfx_editor_files.cmake
@@ -10,7 +10,6 @@
 #
 
 set(FILES
-    Source/EMotionFX_precompiled.cpp
     Source/EMotionFX_precompiled.h
     ../Assets/Editor/Layouts/Layouts.qrc
     ../Assets/Editor/Images/Icons/Resources.qrc
diff --git a/Gems/EMotionFX/Code/emotionfx_files.cmake b/Gems/EMotionFX/Code/emotionfx_files.cmake
index 6650bb05be..88440f2d1d 100644
--- a/Gems/EMotionFX/Code/emotionfx_files.cmake
+++ b/Gems/EMotionFX/Code/emotionfx_files.cmake
@@ -10,7 +10,6 @@
 #
 
 set(FILES
-    Source/EMotionFX_precompiled.cpp
     Source/EMotionFX_precompiled.h
     Include/Integration/AnimationBus.h
     Include/Integration/MotionExtractionBus.h
diff --git a/Gems/FastNoise/Code/Source/FastNoise_precompiled.cpp b/Gems/FastNoise/Code/Source/FastNoise_precompiled.cpp
deleted file mode 100644
index 015459eeae..0000000000
--- a/Gems/FastNoise/Code/Source/FastNoise_precompiled.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#include "FastNoise_precompiled.h"
diff --git a/Gems/FastNoise/Code/fastnoise_files.cmake b/Gems/FastNoise/Code/fastnoise_files.cmake
index 1846b689f7..56b7997848 100644
--- a/Gems/FastNoise/Code/fastnoise_files.cmake
+++ b/Gems/FastNoise/Code/fastnoise_files.cmake
@@ -10,7 +10,6 @@
 #
 
 set(FILES
-    Source/FastNoise_precompiled.cpp
     Source/FastNoise_precompiled.h
     Include/FastNoise/Ebuses/FastNoiseBus.h
     Include/FastNoise/Ebuses/FastNoiseGradientRequestBus.h
diff --git a/Gems/Gestures/Code/Source/Gestures_precompiled.cpp b/Gems/Gestures/Code/Source/Gestures_precompiled.cpp
deleted file mode 100644
index f0f3900ac9..0000000000
--- a/Gems/Gestures/Code/Source/Gestures_precompiled.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#include "Gestures_precompiled.h"
diff --git a/Gems/Gestures/Code/gestures_files.cmake b/Gems/Gestures/Code/gestures_files.cmake
index c4b6dec967..c94189a295 100644
--- a/Gems/Gestures/Code/gestures_files.cmake
+++ b/Gems/Gestures/Code/gestures_files.cmake
@@ -10,7 +10,6 @@
 #
 
 set(FILES
-    Source/Gestures_precompiled.cpp
     Source/Gestures_precompiled.h
     Include/Gestures/GestureRecognizerClickOrTap.h
     Include/Gestures/GestureRecognizerClickOrTap.inl
diff --git a/Gems/GradientSignal/Code/Source/GradientSignal_precompiled.cpp b/Gems/GradientSignal/Code/Source/GradientSignal_precompiled.cpp
deleted file mode 100644
index cc70b11143..0000000000
--- a/Gems/GradientSignal/Code/Source/GradientSignal_precompiled.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#include "GradientSignal_precompiled.h"
diff --git a/Gems/GradientSignal/Code/gradientsignal_files.cmake b/Gems/GradientSignal/Code/gradientsignal_files.cmake
index 1b5b16b5e0..88c6c604fe 100644
--- a/Gems/GradientSignal/Code/gradientsignal_files.cmake
+++ b/Gems/GradientSignal/Code/gradientsignal_files.cmake
@@ -10,7 +10,6 @@
 #
 
 set(FILES
-    Source/GradientSignal_precompiled.cpp
     Source/GradientSignal_precompiled.h
     Include/GradientSignal/GradientSampler.h
     Include/GradientSignal/SmoothStep.h
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 ca5e962685..2917642d66 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/Model/NodePaletteSortFilterProxyModel.cpp
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/Model/NodePaletteSortFilterProxyModel.cpp
@@ -147,16 +147,17 @@ namespace GraphCanvas
             return true;
         }
 
-        QString test = model->data(index).toString();
 
+        QString test = model->data(index).toString();
+        
         bool showRow = false;
-        int regexIndex = test.lastIndexOf(m_filterRegex);
+        int regexIndex = m_filterRegex.indexIn(test);
 
         if (regexIndex >= 0)
         {
             showRow = true;
-
-            AZStd::pair<int, int> highlight(regexIndex, m_filter.size());
+            
+            AZStd::pair<int, int> highlight(regexIndex, m_filterRegex.matchedLength());
             currentItem->SetHighlight(highlight);
         }
         else
@@ -283,8 +284,20 @@ namespace GraphCanvas
 
     void NodePaletteSortFilterProxyModel::SetFilter(const QString& filter)
     {
-        m_filter = QRegExp::escape(filter);
-        m_filterRegex = QRegExp(m_filter, Qt::CaseInsensitive);
+        // Remove whitespace and escape() so every regexp special character is escaped with a backslash
+        // Then ignore all whitespace by adding \s* (regex optional whitespace match) in between every other character.
+        // We use \s* instead of simply removing all whitespace from the filter and node-names in order to preserve the node-name and accurately highlight the matching portion.
+        // Example: "OnGraphStart" or "On Graph Start"
+        m_filter = QRegExp::escape(filter.simplified().replace(" ", ""));
+        
+        QString regExIgnoreWhitespace(m_filter[0]);
+        for (int i = 1; i < m_filter.size(); ++i)
+        {
+            regExIgnoreWhitespace.append("\\s*");
+            regExIgnoreWhitespace.append(m_filter[i]);
+        }
+        
+        m_filterRegex = QRegExp(regExIgnoreWhitespace, Qt::CaseInsensitive);
     }
 
     void NodePaletteSortFilterProxyModel::ClearFilter()
diff --git a/Gems/GraphCanvas/Code/graphcanvas_files.cmake b/Gems/GraphCanvas/Code/graphcanvas_files.cmake
index 98db1c7709..13d8fa8832 100644
--- a/Gems/GraphCanvas/Code/graphcanvas_files.cmake
+++ b/Gems/GraphCanvas/Code/graphcanvas_files.cmake
@@ -10,7 +10,6 @@
 #
 
 set(FILES
-    precompiled.cpp
     precompiled.h
     Include/GraphCanvas/Widgets/RootGraphicsItem.h
     Include/GraphCanvas/tools.h
diff --git a/Gems/GraphCanvas/Code/precompiled.cpp b/Gems/GraphCanvas/Code/precompiled.cpp
deleted file mode 100644
index 51bab26696..0000000000
--- a/Gems/GraphCanvas/Code/precompiled.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include "precompiled.h"
-
diff --git a/Gems/HttpRequestor/Code/Source/HttpRequestor_precompiled.cpp b/Gems/HttpRequestor/Code/Source/HttpRequestor_precompiled.cpp
deleted file mode 100644
index 87aa3da28e..0000000000
--- a/Gems/HttpRequestor/Code/Source/HttpRequestor_precompiled.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include "HttpRequestor_precompiled.h"
diff --git a/Gems/HttpRequestor/Code/httprequestor_files.cmake b/Gems/HttpRequestor/Code/httprequestor_files.cmake
index c699e829c5..2e83237d35 100644
--- a/Gems/HttpRequestor/Code/httprequestor_files.cmake
+++ b/Gems/HttpRequestor/Code/httprequestor_files.cmake
@@ -10,7 +10,6 @@
 #
 
 set(FILES
-    Source/HttpRequestor_precompiled.cpp
     Source/HttpRequestor_precompiled.h
     Source/HttpRequestManager.cpp
     Source/HttpRequestManager.h
diff --git a/Gems/HttpRequestor/Code/lmbraws_unsupported_files.cmake b/Gems/HttpRequestor/Code/lmbraws_unsupported_files.cmake
index bc5bbc81ca..dee0851f34 100644
--- a/Gems/HttpRequestor/Code/lmbraws_unsupported_files.cmake
+++ b/Gems/HttpRequestor/Code/lmbraws_unsupported_files.cmake
@@ -10,7 +10,6 @@
 #
 
 set(FILES
-    Source/HttpRequestor_precompiled.cpp
     Source/HttpRequestor_precompiled.h
     Source/ComponentStub.cpp
 )
diff --git a/Gems/ImGui/Code/Source/ImGui_precompiled.cpp b/Gems/ImGui/Code/Source/ImGui_precompiled.cpp
deleted file mode 100644
index aa38ffff9c..0000000000
--- a/Gems/ImGui/Code/Source/ImGui_precompiled.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#include "ImGui_precompiled.h"
diff --git a/Gems/ImGui/Code/imgui_common_files.cmake b/Gems/ImGui/Code/imgui_common_files.cmake
index 8ece0845d6..851cd0ccf5 100644
--- a/Gems/ImGui/Code/imgui_common_files.cmake
+++ b/Gems/ImGui/Code/imgui_common_files.cmake
@@ -10,7 +10,6 @@
 #
 
 set(FILES
-    Source/ImGui_precompiled.cpp
     Source/ImGui_precompiled.h
     Include/ImGuiBus.h
     Include/ImGuiContextScope.h
diff --git a/Gems/ImGui/Code/imgui_lyutils_static_files.cmake b/Gems/ImGui/Code/imgui_lyutils_static_files.cmake
index 64e5ea4072..9ed0113424 100644
--- a/Gems/ImGui/Code/imgui_lyutils_static_files.cmake
+++ b/Gems/ImGui/Code/imgui_lyutils_static_files.cmake
@@ -10,7 +10,6 @@
 #
 
 set(FILES
-    Source/ImGui_precompiled.cpp
     Source/ImGui_precompiled.h
     Include/LYImGuiUtils/HistogramContainer.h
     Include/LYImGuiUtils/ImGuiDrawHelpers.h
diff --git a/Gems/InAppPurchases/Code/Source/InAppPurchases_precompiled.cpp b/Gems/InAppPurchases/Code/Source/InAppPurchases_precompiled.cpp
deleted file mode 100644
index b865614634..0000000000
--- a/Gems/InAppPurchases/Code/Source/InAppPurchases_precompiled.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates, or 
-* a third party where indicated.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,  
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
-*
-*/
-
-#include "InAppPurchases_precompiled.h"
diff --git a/Gems/InAppPurchases/Code/inapppurchases_files.cmake b/Gems/InAppPurchases/Code/inapppurchases_files.cmake
index 7b75343af9..01a867313b 100644
--- a/Gems/InAppPurchases/Code/inapppurchases_files.cmake
+++ b/Gems/InAppPurchases/Code/inapppurchases_files.cmake
@@ -10,7 +10,6 @@
 #
 
 set(FILES
-    Source/InAppPurchases_precompiled.cpp
     Source/InAppPurchases_precompiled.h
     Include/InAppPurchases/InAppPurchasesBus.h
     Include/InAppPurchases/InAppPurchasesInterface.h
diff --git a/Gems/LmbrCentral/Code/Source/LmbrCentral_precompiled.cpp b/Gems/LmbrCentral/Code/Source/LmbrCentral_precompiled.cpp
deleted file mode 100644
index 5752d6a093..0000000000
--- a/Gems/LmbrCentral/Code/Source/LmbrCentral_precompiled.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include "LmbrCentral_precompiled.h"
diff --git a/Gems/LmbrCentral/Code/lmbrcentral_files.cmake b/Gems/LmbrCentral/Code/lmbrcentral_files.cmake
index 9b4d01af23..d18da75507 100644
--- a/Gems/LmbrCentral/Code/lmbrcentral_files.cmake
+++ b/Gems/LmbrCentral/Code/lmbrcentral_files.cmake
@@ -10,7 +10,6 @@
 #
 
 set(FILES
-    Source/LmbrCentral_precompiled.cpp
     Source/LmbrCentral_precompiled.h
     include/LmbrCentral/Ai/NavigationComponentBus.h
     include/LmbrCentral/Ai/NavigationAreaBus.h
diff --git a/Gems/LyShine/Code/Editor/UiCanvasEditor_precompiled.cpp b/Gems/LyShine/Code/Editor/UiCanvasEditor_precompiled.cpp
deleted file mode 100644
index e894c3a0f7..0000000000
--- a/Gems/LyShine/Code/Editor/UiCanvasEditor_precompiled.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#include "UiCanvasEditor_precompiled.h"
diff --git a/Gems/LyShine/Code/Source/Animation/LyShine_precompiled.cpp b/Gems/LyShine/Code/Source/Animation/LyShine_precompiled.cpp
deleted file mode 100644
index 02d8df72c1..0000000000
--- a/Gems/LyShine/Code/Source/Animation/LyShine_precompiled.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include "LyShine_precompiled.h"
diff --git a/Gems/LyShine/Code/Source/LyShine_precompiled.cpp b/Gems/LyShine/Code/Source/LyShine_precompiled.cpp
deleted file mode 100644
index 02d8df72c1..0000000000
--- a/Gems/LyShine/Code/Source/LyShine_precompiled.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include "LyShine_precompiled.h"
diff --git a/Gems/LyShine/Code/lyshine_static_files.cmake b/Gems/LyShine/Code/lyshine_static_files.cmake
index 8491a66030..2435a01623 100644
--- a/Gems/LyShine/Code/lyshine_static_files.cmake
+++ b/Gems/LyShine/Code/lyshine_static_files.cmake
@@ -16,7 +16,6 @@ set(FILES
     Source/LyShine.h
     Source/LyShineDebug.cpp
     Source/LyShineDebug.h
-    Source/LyShine_precompiled.cpp
     Source/LyShine_precompiled.h
     Source/StringUtfUtils.h
     Source/UiImageComponent.cpp
diff --git a/Gems/LyShine/Code/lyshine_uicanvaseditor_files.cmake b/Gems/LyShine/Code/lyshine_uicanvaseditor_files.cmake
index 82fc50584c..a434ec2343 100644
--- a/Gems/LyShine/Code/lyshine_uicanvaseditor_files.cmake
+++ b/Gems/LyShine/Code/lyshine_uicanvaseditor_files.cmake
@@ -12,7 +12,6 @@
 set(FILES
     Editor/LyShineEditorSystemComponent.cpp
     Editor/LyShineEditorSystemComponent.h
-    Editor/UiCanvasEditor_precompiled.cpp
     Editor/UiCanvasEditor_precompiled.h
     Editor/UiCanvasEditor.qrc
     Editor/Animation/UiAnimViewDialog.cpp
diff --git a/Gems/LyShineExamples/Code/Source/LyShineExamples_precompiled.cpp b/Gems/LyShineExamples/Code/Source/LyShineExamples_precompiled.cpp
deleted file mode 100644
index 33c6ac3831..0000000000
--- a/Gems/LyShineExamples/Code/Source/LyShineExamples_precompiled.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates, or 
-* a third party where indicated.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,  
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
-*
-*/
-
-#include "LyShineExamples_precompiled.h"
diff --git a/Gems/LyShineExamples/Code/lyshineexamples_files.cmake b/Gems/LyShineExamples/Code/lyshineexamples_files.cmake
index 08fccda4ea..c82899c374 100644
--- a/Gems/LyShineExamples/Code/lyshineexamples_files.cmake
+++ b/Gems/LyShineExamples/Code/lyshineexamples_files.cmake
@@ -10,7 +10,6 @@
 #
 
 set(FILES
-    Source/LyShineExamples_precompiled.cpp
     Source/LyShineExamples_precompiled.h
     Include/LyShineExamples/LyShineExamplesBus.h
     Include/LyShineExamples/LyShineExamplesCppExampleBus.h
diff --git a/Gems/Maestro/Code/Source/Cinematics/Maestro_precompiled.cpp b/Gems/Maestro/Code/Source/Cinematics/Maestro_precompiled.cpp
deleted file mode 100644
index 40dec66d87..0000000000
--- a/Gems/Maestro/Code/Source/Cinematics/Maestro_precompiled.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "Maestro_precompiled.h"
diff --git a/Gems/Maestro/Code/Source/Maestro_precompiled.cpp b/Gems/Maestro/Code/Source/Maestro_precompiled.cpp
deleted file mode 100644
index d0c3f18d11..0000000000
--- a/Gems/Maestro/Code/Source/Maestro_precompiled.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#include "Maestro_precompiled.h"
diff --git a/Gems/Maestro/Code/maestro_static_files.cmake b/Gems/Maestro/Code/maestro_static_files.cmake
index c0fb90ddca..3fd5671898 100644
--- a/Gems/Maestro/Code/maestro_static_files.cmake
+++ b/Gems/Maestro/Code/maestro_static_files.cmake
@@ -10,7 +10,6 @@
 #
 
 set(FILES
-    Source/Maestro_precompiled.cpp
     Source/Maestro_precompiled.h
     Source/Cinematics/ShadowsSetupNode.h
     Source/Cinematics/ShadowsSetupNode.cpp
diff --git a/Gems/MessagePopup/Code/Source/MessagePopup_precompiled.cpp b/Gems/MessagePopup/Code/Source/MessagePopup_precompiled.cpp
deleted file mode 100644
index 45495b87d0..0000000000
--- a/Gems/MessagePopup/Code/Source/MessagePopup_precompiled.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
-* All or portions of this file Copyright(c) Amazon.com, Inc.or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*/
-
-#include "MessagePopup_precompiled.h"
diff --git a/Gems/MessagePopup/Code/messagepopup_files.cmake b/Gems/MessagePopup/Code/messagepopup_files.cmake
index 3c8b98378a..73a5f3f6b6 100644
--- a/Gems/MessagePopup/Code/messagepopup_files.cmake
+++ b/Gems/MessagePopup/Code/messagepopup_files.cmake
@@ -10,7 +10,6 @@
 #
 
 set(FILES
-    Source/MessagePopup_precompiled.cpp
     Source/MessagePopup_precompiled.h
     Include/MessagePopup/MessagePopupBus.h
     Source/MessagePopupSystemComponent.cpp
diff --git a/Gems/Metastream/Code/Source/Metastream_precompiled.cpp b/Gems/Metastream/Code/Source/Metastream_precompiled.cpp
deleted file mode 100644
index 7b4896ad9f..0000000000
--- a/Gems/Metastream/Code/Source/Metastream_precompiled.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#include "Metastream_precompiled.h"
diff --git a/Gems/Metastream/Code/metastream_files.cmake b/Gems/Metastream/Code/metastream_files.cmake
index c5fd0ee95b..575aa09340 100644
--- a/Gems/Metastream/Code/metastream_files.cmake
+++ b/Gems/Metastream/Code/metastream_files.cmake
@@ -10,7 +10,6 @@
 #
 
 set(FILES
-    Source/Metastream_precompiled.cpp
     Source/Metastream_precompiled.h
     Include/Metastream/MetastreamBus.h
     Source/DataCache.h
diff --git a/Gems/Microphone/Code/Source/Microphone_precompiled.cpp b/Gems/Microphone/Code/Source/Microphone_precompiled.cpp
deleted file mode 100644
index a584ed909d..0000000000
--- a/Gems/Microphone/Code/Source/Microphone_precompiled.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include "Microphone_precompiled.h"
diff --git a/Gems/Microphone/Code/microphone_files.cmake b/Gems/Microphone/Code/microphone_files.cmake
index 1058deb13c..d32a723cfb 100644
--- a/Gems/Microphone/Code/microphone_files.cmake
+++ b/Gems/Microphone/Code/microphone_files.cmake
@@ -10,7 +10,6 @@
 #
 
 set(FILES
-    Source/Microphone_precompiled.cpp
     Source/Microphone_precompiled.h
     Source/MicrophoneSystemComponent.cpp
     Source/MicrophoneSystemComponent.h
diff --git a/Gems/Multiplayer/Code/Source/AutoGen/AutoComponent_Source.jinja b/Gems/Multiplayer/Code/Source/AutoGen/AutoComponent_Source.jinja
index 259f469020..21bf6ab69b 100644
--- a/Gems/Multiplayer/Code/Source/AutoGen/AutoComponent_Source.jinja
+++ b/Gems/Multiplayer/Code/Source/AutoGen/AutoComponent_Source.jinja
@@ -368,26 +368,26 @@ void {{ ClassName }}::Signal{{ UpperFirst(Property.attrib['Name']) }}({{ ', '.jo
             ->Method("{{ UpperFirst(Property.attrib['Name']) }}", [](const {{ ClassName }}* self, {{ ', '.join(paramDefines) }}) {
                         self->m_controller->{{ UpperFirst(Property.attrib['Name']) }}({{ ', '.join(paramNames) }});
                     })
-            ->Method("{{ UpperFirst(Property.attrib['Name']) }}ByEntity", [](AZ::EntityId id, {{ ', '.join(paramDefines) }}) {
+            ->Method("{{ UpperFirst(Property.attrib['Name']) }}ByEntityId", [](AZ::EntityId id, {{ ', '.join(paramDefines) }}) {
 
                         AZ::Entity* entity = AZ::Interface<AZ::ComponentApplicationRequests>::Get()->FindEntity(id);
                         if (!entity)
                         {
-                            AZ_Warning("Network Property", false, "{{ ClassName }} Get{{ UpperFirst(Property.attrib['Name']) }} failed. The entity with id %s doesn't exist, please provide a valid entity id.", id.ToString().c_str())
+                            AZ_Warning("Network Property", false, "{{ ClassName }} {{ UpperFirst(Property.attrib['Name']) }}ByEntityId failed. The entity with id %s doesn't exist, please provide a valid entity id.", id.ToString().c_str())
                             return;
                         }
 
                         {{ ClassName }}* networkComponent = entity->FindComponent<{{ ClassName }}>();
                         if (!networkComponent)
                         {
-                            AZ_Warning("Network Property", false, "{{ ClassName }} Get{{ UpperFirst(Property.attrib['Name']) }} failed. Entity '%s' (id: %s) is missing {{ ClassName }}, be sure to add {{ ClassName }} to this entity.", entity->GetName().c_str(), id.ToString().c_str())
+                            AZ_Warning("Network Property", false, "{{ ClassName }} {{ UpperFirst(Property.attrib['Name']) }}ByEntityId failed. Entity '%s' (id: %s) is missing {{ ClassName }}, be sure to add {{ ClassName }} to this entity.", entity->GetName().c_str(), id.ToString().c_str())
                             return;
                         }
 
                         {{ ClassName }}Controller* controller = static_cast<{{ ClassName }}Controller*>(networkComponent->GetController());
                         if (!controller)
                         {
-                            AZ_Warning("Network Property", false, "{{ ClassName }} Get{{ UpperFirst(Property.attrib['Name']) }} method failed. Entity '%s' (id: %s) {{ ClassName }} is missing the network controller. This RemoteProcedure can only be invoked from {{InvokeFrom}} network entities, because this entity doesn't have a controller, it must not be a {{InvokeFrom}} entity. Please check your network context before attempting to call {{ UpperFirst(Property.attrib['Name']) }}.", entity->GetName().c_str(), id.ToString().c_str())
+                            AZ_Warning("Network Property", false, "{{ ClassName }} {{ UpperFirst(Property.attrib['Name']) }}ByEntityId method failed. Entity '%s' (id: %s) {{ ClassName }} is missing the network controller. This RemoteProcedure can only be invoked from {{InvokeFrom}} network entities, because this entity doesn't have a controller, it must not be a {{InvokeFrom}} entity. Please check your network context before attempting to call {{ UpperFirst(Property.attrib['Name']) }}.", entity->GetName().c_str(), id.ToString().c_str())
                             return;
                         }
 
@@ -429,6 +429,32 @@ void {{ ClassName }}::Signal{{ UpperFirst(Property.attrib['Name']) }}({{ ', '.jo
         ->Method("Get{{ UpperFirst(Property.attrib['Name']) }}Event", [](const {{ ClassName }}* self) -> AZ::Event<{{ ', '.join(paramTypes) }}>&
         {
             return self->m_controller->Get{{ UpperFirst(Property.attrib['Name']) }}Event();
+        })
+            ->Attribute(AZ::Script::Attributes::AzEventDescription, {{ LowerFirst(Property.attrib['Name']) }}EventDesc)
+        ->Method("Get{{ UpperFirst(Property.attrib['Name']) }}EventByEntityId", [](AZ::EntityId id) -> AZ::Event<{{ ', '.join(paramTypes) }}>*
+        {
+            AZ::Entity* entity = AZ::Interface<AZ::ComponentApplicationRequests>::Get()->FindEntity(id);
+            if (!entity)
+            {
+                AZ_Warning("Network Property", false, "{{ ClassName }} Get{{ UpperFirst(Property.attrib['Name']) }}EventByEntityId failed. The entity with id %s doesn't exist, please provide a valid entity id.", id.ToString().c_str())
+                return nullptr;
+            }
+
+            {{ ClassName }}* networkComponent = entity->FindComponent<{{ ClassName }}>();
+            if (!networkComponent)
+            {
+                AZ_Warning("Network Property", false, "{{ ClassName }} Get{{ UpperFirst(Property.attrib['Name']) }}EventByEntityId failed. Entity '%s' (id: %s) is missing {{ ClassName }}, be sure to add {{ ClassName }} to this entity.", entity->GetName().c_str(), id.ToString().c_str())
+                return nullptr;
+            }
+
+            {{ ClassName }}Controller* controller = static_cast<{{ ClassName }}Controller*>(networkComponent->GetController());
+            if (!controller)
+            {
+                AZ_Warning("Network Property", false, "{{ ClassName }} Get{{ UpperFirst(Property.attrib['Name']) }}EventByEntity method failed. Entity '%s' (id: %s) {{ ClassName }} is missing the network controller. This RemoteProcedure can only be received by {{InvokeTo}} network entities, because this entity doesn't have a controller, it must not be a {{InvokeTo}} entity. Please check your network context before attempting to Get{{ UpperFirst(Property.attrib['Name']) }}Event.", entity->GetName().c_str(), id.ToString().c_str())
+                return nullptr;
+            }
+
+            return &controller->Get{{ UpperFirst(Property.attrib['Name']) }}Event();
         })
             ->Attribute(AZ::Script::Attributes::AzEventDescription, AZStd::move({{ LowerFirst(Property.attrib['Name']) }}EventDesc))
 {% endif %}
diff --git a/Gems/Multiplayer/Code/Source/Multiplayer_precompiled.cpp b/Gems/Multiplayer/Code/Source/Multiplayer_precompiled.cpp
deleted file mode 100644
index fa8fd7b67c..0000000000
--- a/Gems/Multiplayer/Code/Source/Multiplayer_precompiled.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include "Multiplayer_precompiled.h"
diff --git a/Gems/Multiplayer/Code/multiplayer_debug_files.cmake b/Gems/Multiplayer/Code/multiplayer_debug_files.cmake
index 8d0b121735..4b175c7691 100644
--- a/Gems/Multiplayer/Code/multiplayer_debug_files.cmake
+++ b/Gems/Multiplayer/Code/multiplayer_debug_files.cmake
@@ -10,7 +10,6 @@
 #
 
 set(FILES
-    Source/Multiplayer_precompiled.cpp
     Source/Multiplayer_precompiled.h
     Source/Debug/MultiplayerDebugModule.cpp
     Source/Debug/MultiplayerDebugModule.h
diff --git a/Gems/Multiplayer/Code/multiplayer_files.cmake b/Gems/Multiplayer/Code/multiplayer_files.cmake
index 73de45ba9d..9f5ca8c805 100644
--- a/Gems/Multiplayer/Code/multiplayer_files.cmake
+++ b/Gems/Multiplayer/Code/multiplayer_files.cmake
@@ -41,7 +41,6 @@ set(FILES
     Include/Multiplayer/NetworkTime/RewindableObject.inl
     Include/Multiplayer/Physics/PhysicsUtils.h
     Include/Multiplayer/ReplicationWindows/IReplicationWindow.h
-    Source/Multiplayer_precompiled.cpp
     Source/Multiplayer_precompiled.h
     Source/MultiplayerSystemComponent.cpp
     Source/MultiplayerSystemComponent.h
diff --git a/Gems/Multiplayer/Code/multiplayer_tools_files.cmake b/Gems/Multiplayer/Code/multiplayer_tools_files.cmake
index 3fef954ba6..bc0b3feeeb 100644
--- a/Gems/Multiplayer/Code/multiplayer_tools_files.cmake
+++ b/Gems/Multiplayer/Code/multiplayer_tools_files.cmake
@@ -11,7 +11,6 @@
 
 set(FILES
     Include/Multiplayer/IMultiplayerTools.h
-    Source/Multiplayer_precompiled.cpp
     Source/Multiplayer_precompiled.h
     Source/Pipeline/NetworkPrefabProcessor.cpp
     Source/Pipeline/NetworkPrefabProcessor.h
diff --git a/Gems/PhysX/Code/NumericalMethods/Source/NumericalMethods_precompiled.cpp b/Gems/PhysX/Code/NumericalMethods/Source/NumericalMethods_precompiled.cpp
deleted file mode 100644
index 4b6948a654..0000000000
--- a/Gems/PhysX/Code/NumericalMethods/Source/NumericalMethods_precompiled.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include <NumericalMethods_precompiled.h>
diff --git a/Gems/PhysX/Code/NumericalMethods/numericalmethods_files.cmake b/Gems/PhysX/Code/NumericalMethods/numericalmethods_files.cmake
index 1e7abecd31..eb96204150 100644
--- a/Gems/PhysX/Code/NumericalMethods/numericalmethods_files.cmake
+++ b/Gems/PhysX/Code/NumericalMethods/numericalmethods_files.cmake
@@ -10,7 +10,6 @@
 #
 
 set(FILES
-    Source/NumericalMethods_precompiled.cpp
     Source/NumericalMethods_precompiled.h
     Include/NumericalMethods/Optimization.h
     Include/NumericalMethods/Eigenanalysis.h
diff --git a/Gems/PhysX/Code/Source/PhysXUnsupported_precompiled.cpp b/Gems/PhysX/Code/Source/PhysXUnsupported_precompiled.cpp
deleted file mode 100644
index 04bb39a00f..0000000000
--- a/Gems/PhysX/Code/Source/PhysXUnsupported_precompiled.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include <PhysXUnsupported_precompiled.h>
diff --git a/Gems/PhysX/Code/Source/PhysX_precompiled.cpp b/Gems/PhysX/Code/Source/PhysX_precompiled.cpp
deleted file mode 100644
index 1300e5b541..0000000000
--- a/Gems/PhysX/Code/Source/PhysX_precompiled.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include <PhysX_precompiled.h>
diff --git a/Gems/PhysX/Code/physx_files.cmake b/Gems/PhysX/Code/physx_files.cmake
index 6350c06e0d..24aa42d62a 100644
--- a/Gems/PhysX/Code/physx_files.cmake
+++ b/Gems/PhysX/Code/physx_files.cmake
@@ -10,7 +10,6 @@
 #
 
 set(FILES
-    Source/PhysX_precompiled.cpp
     Source/PhysX_precompiled.h
     Source/SystemComponent.cpp
     Source/SystemComponent.h
diff --git a/Gems/PhysXDebug/Code/Source/PhysXDebugUnsupported_precompiled.cpp b/Gems/PhysXDebug/Code/Source/PhysXDebugUnsupported_precompiled.cpp
deleted file mode 100644
index 4199046abd..0000000000
--- a/Gems/PhysXDebug/Code/Source/PhysXDebugUnsupported_precompiled.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include <PhysXDebugUnsupported_precompiled.h>
diff --git a/Gems/PhysXDebug/Code/Source/PhysXDebug_precompiled.cpp b/Gems/PhysXDebug/Code/Source/PhysXDebug_precompiled.cpp
deleted file mode 100644
index 2fb13c5f8a..0000000000
--- a/Gems/PhysXDebug/Code/Source/PhysXDebug_precompiled.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#include "PhysXDebug_precompiled.h"
diff --git a/Gems/PhysXDebug/Code/Source/SystemComponent.cpp b/Gems/PhysXDebug/Code/Source/SystemComponent.cpp
index 34315eb11e..c693599a59 100644
--- a/Gems/PhysXDebug/Code/Source/SystemComponent.cpp
+++ b/Gems/PhysXDebug/Code/Source/SystemComponent.cpp
@@ -42,7 +42,7 @@ namespace PhysXDebug
     const float SystemComponent::m_maxCullingBoxSize = 150.0f;
     namespace Internal
     {
-        const AZ::Crc32 VewportId = 0; // was AzFramework::g_defaultSceneEntityDebugDisplayId but it didn't render to the viewport.
+        const AZ::Crc32 VewportId = AzFramework::g_defaultSceneEntityDebugDisplayId;
     }
 
     bool UseEditorPhysicsScene()
@@ -565,9 +565,9 @@ namespace PhysXDebug
     static void physx_CullingBoxSize([[maybe_unused]] const AZ::ConsoleCommandContainer& arguments)
     {
         const int argumentCount = arguments.size();
-        if (argumentCount == 2)
+        if (argumentCount == 1)
         {
-            float newCullingBoxSize = (float)strtol(AZ::CVarFixedString(arguments[1]).c_str(), nullptr, 10);
+            float newCullingBoxSize = (float)strtol(AZ::CVarFixedString(arguments[0]).c_str(), nullptr, 10);
             PhysXDebug::PhysXDebugRequestBus::Broadcast(&PhysXDebug::PhysXDebugRequestBus::Events::SetCullingBoxSize, newCullingBoxSize);
         }
         else
@@ -584,9 +584,9 @@ namespace PhysXDebug
 
         const int argumentCount = arguments.size();
 
-        if (argumentCount == 2)
+        if (argumentCount == 1)
         {
-            const auto userPreference = static_cast<DebugCVarValues>(strtol(AZ::CVarFixedString(arguments[1]).c_str(), nullptr, 10));
+            const auto userPreference = static_cast<DebugCVarValues>(strtol(AZ::CVarFixedString(arguments[0]).c_str(), nullptr, 10));
 
             switch (userPreference)
             {
diff --git a/Gems/PhysXDebug/Code/physxdebug_editor_files.cmake b/Gems/PhysXDebug/Code/physxdebug_editor_files.cmake
index 2645795a77..460da598a0 100644
--- a/Gems/PhysXDebug/Code/physxdebug_editor_files.cmake
+++ b/Gems/PhysXDebug/Code/physxdebug_editor_files.cmake
@@ -10,7 +10,6 @@
 #
 
 set(FILES
-    Source/PhysXDebug_precompiled.cpp
     Source/PhysXDebug_precompiled.h
     Source/EditorSystemComponent.cpp
     Source/EditorSystemComponent.h
diff --git a/Gems/PhysXDebug/Code/physxdebug_files.cmake b/Gems/PhysXDebug/Code/physxdebug_files.cmake
index 7eea56626b..2d04c8e5de 100644
--- a/Gems/PhysXDebug/Code/physxdebug_files.cmake
+++ b/Gems/PhysXDebug/Code/physxdebug_files.cmake
@@ -10,7 +10,6 @@
 #
 
 set(FILES
-    Source/PhysXDebug_precompiled.cpp
     Source/PhysXDebug_precompiled.h
     Include/PhysXDebug/PhysXDebugBus.h
     Source/Module.cpp
diff --git a/Gems/PhysXDebug/Code/physxdebug_unsupported_files.cmake b/Gems/PhysXDebug/Code/physxdebug_unsupported_files.cmake
index e5d7ae7e46..76649b2a91 100644
--- a/Gems/PhysXDebug/Code/physxdebug_unsupported_files.cmake
+++ b/Gems/PhysXDebug/Code/physxdebug_unsupported_files.cmake
@@ -11,6 +11,5 @@
 
 set(FILES
     Source/ModuleUnsupported.cpp
-    Source/PhysXDebugUnsupported_precompiled.cpp
     Source/PhysXDebugUnsupported_precompiled.h
 )
diff --git a/Gems/ScriptCanvas/Code/Editor/precompiled.cpp b/Gems/ScriptCanvas/Code/Editor/precompiled.cpp
deleted file mode 100644
index 6fdd7bdc45..0000000000
--- a/Gems/ScriptCanvas/Code/Editor/precompiled.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include "precompiled.h"
diff --git a/Gems/ScriptCanvas/Code/Source/precompiled.cpp b/Gems/ScriptCanvas/Code/Source/precompiled.cpp
deleted file mode 100644
index 6fdd7bdc45..0000000000
--- a/Gems/ScriptCanvas/Code/Source/precompiled.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include "precompiled.h"
diff --git a/Gems/ScriptCanvas/Code/scriptcanvasgem_editor_files.cmake b/Gems/ScriptCanvas/Code/scriptcanvasgem_editor_files.cmake
index 2f1555af3d..54fd98b4ce 100644
--- a/Gems/ScriptCanvas/Code/scriptcanvasgem_editor_files.cmake
+++ b/Gems/ScriptCanvas/Code/scriptcanvasgem_editor_files.cmake
@@ -10,7 +10,6 @@
 #
 
 set(FILES
-    Editor/precompiled.cpp
     Editor/precompiled.h
     Editor/ScriptCanvasEditorGem.cpp
     Editor/Settings.h
diff --git a/Gems/ScriptCanvas/Code/scriptcanvasgem_editor_shared_files.cmake b/Gems/ScriptCanvas/Code/scriptcanvasgem_editor_shared_files.cmake
index 17b62d1d3d..42b6bfed72 100644
--- a/Gems/ScriptCanvas/Code/scriptcanvasgem_editor_shared_files.cmake
+++ b/Gems/ScriptCanvas/Code/scriptcanvasgem_editor_shared_files.cmake
@@ -10,7 +10,6 @@
 #
 
 set(FILES
-    Editor/precompiled.cpp
     Editor/precompiled.h
     Editor/ScriptCanvasEditorGem.cpp
     Include/ScriptCanvas/ScriptCanvasGem.h
diff --git a/Gems/ScriptCanvas/Code/scriptcanvasgem_game_files.cmake b/Gems/ScriptCanvas/Code/scriptcanvasgem_game_files.cmake
index ead7f6d660..dfe0c6f5e3 100644
--- a/Gems/ScriptCanvas/Code/scriptcanvasgem_game_files.cmake
+++ b/Gems/ScriptCanvas/Code/scriptcanvasgem_game_files.cmake
@@ -10,7 +10,6 @@
 #
 
 set(FILES
-    Source/precompiled.cpp
     Source/precompiled.h
     Source/ScriptCanvasGem.cpp
 )
diff --git a/Gems/ScriptCanvas/Code/scriptcanvasgem_tests_files.cmake b/Gems/ScriptCanvas/Code/scriptcanvasgem_tests_files.cmake
index 9a877a2b42..7791c9ca48 100644
--- a/Gems/ScriptCanvas/Code/scriptcanvasgem_tests_files.cmake
+++ b/Gems/ScriptCanvas/Code/scriptcanvasgem_tests_files.cmake
@@ -10,7 +10,6 @@
 #
 
 set(FILES
-    Source/precompiled.cpp
     Source/precompiled.h
     Tests/ScriptCanvasTest.cpp
 )
diff --git a/Gems/ScriptCanvasDeveloper/Code/Source/precompiled.cpp b/Gems/ScriptCanvasDeveloper/Code/Source/precompiled.cpp
deleted file mode 100644
index 6fdd7bdc45..0000000000
--- a/Gems/ScriptCanvasDeveloper/Code/Source/precompiled.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include "precompiled.h"
diff --git a/Gems/ScriptCanvasDeveloper/Code/scriptcanvasdeveloper_gem_common_files.cmake b/Gems/ScriptCanvasDeveloper/Code/scriptcanvasdeveloper_gem_common_files.cmake
index fd63448066..34de0f5910 100644
--- a/Gems/ScriptCanvasDeveloper/Code/scriptcanvasdeveloper_gem_common_files.cmake
+++ b/Gems/ScriptCanvasDeveloper/Code/scriptcanvasdeveloper_gem_common_files.cmake
@@ -10,7 +10,6 @@
 #
 
 set(FILES
-    Source/precompiled.cpp
     Source/precompiled.h
     Include/ScriptCanvasDeveloper/ScriptCanvasDeveloperGem.h
     Include/ScriptCanvasDeveloper/ScriptCanvasDeveloperComponent.h
diff --git a/Gems/ScriptCanvasPhysics/Code/Source/ScriptCanvasPhysics_precompiled.cpp b/Gems/ScriptCanvasPhysics/Code/Source/ScriptCanvasPhysics_precompiled.cpp
deleted file mode 100644
index 683b5507b8..0000000000
--- a/Gems/ScriptCanvasPhysics/Code/Source/ScriptCanvasPhysics_precompiled.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include "ScriptCanvasPhysics_precompiled.h"
diff --git a/Gems/ScriptCanvasPhysics/Code/scriptcanvas_physics_files.cmake b/Gems/ScriptCanvasPhysics/Code/scriptcanvas_physics_files.cmake
index b2fdfacf67..8815d67909 100644
--- a/Gems/ScriptCanvasPhysics/Code/scriptcanvas_physics_files.cmake
+++ b/Gems/ScriptCanvasPhysics/Code/scriptcanvas_physics_files.cmake
@@ -10,7 +10,6 @@
 #
 
 set(FILES
-    Source/ScriptCanvasPhysics_precompiled.cpp
     Source/ScriptCanvasPhysics_precompiled.h
     Source/PhysicsNodeLibrary.cpp
     Source/PhysicsNodeLibrary.h
diff --git a/Gems/ScriptCanvasPhysics/Code/scriptcanvas_physics_shared_files.cmake b/Gems/ScriptCanvasPhysics/Code/scriptcanvas_physics_shared_files.cmake
index 769a3db241..b7c97e99ec 100644
--- a/Gems/ScriptCanvasPhysics/Code/scriptcanvas_physics_shared_files.cmake
+++ b/Gems/ScriptCanvasPhysics/Code/scriptcanvas_physics_shared_files.cmake
@@ -10,7 +10,6 @@
 #
 
 set(FILES
-    Source/ScriptCanvasPhysics_precompiled.cpp
     Source/ScriptCanvasPhysics_precompiled.h
     Source/ScriptCanvasPhysicsModule.cpp
 )
diff --git a/Gems/ScriptEvents/Code/Source/precompiled.cpp b/Gems/ScriptEvents/Code/Source/precompiled.cpp
deleted file mode 100644
index 6fdd7bdc45..0000000000
--- a/Gems/ScriptEvents/Code/Source/precompiled.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include "precompiled.h"
diff --git a/Gems/ScriptEvents/Code/scriptevents_editor_files.cmake b/Gems/ScriptEvents/Code/scriptevents_editor_files.cmake
index 8fc57de0dd..c3a491d5bf 100644
--- a/Gems/ScriptEvents/Code/scriptevents_editor_files.cmake
+++ b/Gems/ScriptEvents/Code/scriptevents_editor_files.cmake
@@ -10,7 +10,6 @@
 #
 
 set(FILES
-    Source/precompiled.cpp
     Source/precompiled.h
     Source/Editor/ScriptEventsEditorGem.cpp
     Source/Editor/ScriptEventsSystemEditorComponent.cpp
diff --git a/Gems/ScriptEvents/Code/scriptevents_files.cmake b/Gems/ScriptEvents/Code/scriptevents_files.cmake
index a79f81ab28..348ac8b1b5 100644
--- a/Gems/ScriptEvents/Code/scriptevents_files.cmake
+++ b/Gems/ScriptEvents/Code/scriptevents_files.cmake
@@ -10,7 +10,6 @@
 #
 
 set(FILES
-    Source/precompiled.cpp
     Source/precompiled.h
     Source/ScriptEventsGem.cpp
 )
diff --git a/Gems/ScriptedEntityTweener/Code/Source/ScriptedEntityTweener_precompiled.cpp b/Gems/ScriptedEntityTweener/Code/Source/ScriptedEntityTweener_precompiled.cpp
deleted file mode 100644
index 85423f94c1..0000000000
--- a/Gems/ScriptedEntityTweener/Code/Source/ScriptedEntityTweener_precompiled.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates, or 
-* a third party where indicated.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,  
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
-*
-*/
-
-#include "ScriptedEntityTweener_precompiled.h"
diff --git a/Gems/ScriptedEntityTweener/Code/scriptedentitytweener_files.cmake b/Gems/ScriptedEntityTweener/Code/scriptedentitytweener_files.cmake
index b889832c16..e3d8d57e2b 100644
--- a/Gems/ScriptedEntityTweener/Code/scriptedentitytweener_files.cmake
+++ b/Gems/ScriptedEntityTweener/Code/scriptedentitytweener_files.cmake
@@ -10,7 +10,6 @@
 #
 
 set(FILES
-    Source/ScriptedEntityTweener_precompiled.cpp
     Source/ScriptedEntityTweener_precompiled.h
     Include/ScriptedEntityTweener/ScriptedEntityTweenerBus.h
     Include/ScriptedEntityTweener/ScriptedEntityTweenerEnums.h
diff --git a/Gems/SliceFavorites/Code/Source/SliceFavorites_precompiled.cpp b/Gems/SliceFavorites/Code/Source/SliceFavorites_precompiled.cpp
deleted file mode 100644
index 99dba85db4..0000000000
--- a/Gems/SliceFavorites/Code/Source/SliceFavorites_precompiled.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include "SliceFavorites_precompiled.h"
diff --git a/Gems/SliceFavorites/Code/slicefavorites_files.cmake b/Gems/SliceFavorites/Code/slicefavorites_files.cmake
index c0b878cbb8..06fcdc87e3 100644
--- a/Gems/SliceFavorites/Code/slicefavorites_files.cmake
+++ b/Gems/SliceFavorites/Code/slicefavorites_files.cmake
@@ -10,7 +10,6 @@
 #
 
 set(FILES
-    Source/SliceFavorites_precompiled.cpp
     Source/SliceFavorites_precompiled.h
     Include/SliceFavorites/SliceFavoritesBus.h
     Source/SliceFavoritesSystemComponent.cpp
diff --git a/Gems/StartingPointCamera/Code/Source/StartingPointCamera_precompiled.cpp b/Gems/StartingPointCamera/Code/Source/StartingPointCamera_precompiled.cpp
deleted file mode 100644
index 79702ea5f2..0000000000
--- a/Gems/StartingPointCamera/Code/Source/StartingPointCamera_precompiled.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#include "StartingPointCamera_precompiled.h"
diff --git a/Gems/StartingPointCamera/Code/startingpointcamera_files.cmake b/Gems/StartingPointCamera/Code/startingpointcamera_files.cmake
index e0f5331e41..9f4c100f77 100644
--- a/Gems/StartingPointCamera/Code/startingpointcamera_files.cmake
+++ b/Gems/StartingPointCamera/Code/startingpointcamera_files.cmake
@@ -33,6 +33,5 @@ set(FILES
     Source/CameraTransformBehaviors/OffsetCameraPosition.cpp
     Source/CameraTransformBehaviors/Rotate.h
     Source/CameraTransformBehaviors/Rotate.cpp
-    Source/StartingPointCamera_precompiled.cpp
     Source/StartingPointCamera_precompiled.h
 )
diff --git a/Gems/StartingPointInput/Code/Source/StartingPointInput_precompiled.cpp b/Gems/StartingPointInput/Code/Source/StartingPointInput_precompiled.cpp
deleted file mode 100644
index e4c7581b08..0000000000
--- a/Gems/StartingPointInput/Code/Source/StartingPointInput_precompiled.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#include "StartingPointInput_precompiled.h"
diff --git a/Gems/StartingPointInput/Code/startingpointinput_editor_files.cmake b/Gems/StartingPointInput/Code/startingpointinput_editor_files.cmake
index b1e619c55d..fd69b6180c 100644
--- a/Gems/StartingPointInput/Code/startingpointinput_editor_files.cmake
+++ b/Gems/StartingPointInput/Code/startingpointinput_editor_files.cmake
@@ -24,6 +24,4 @@ set(FILES
     Source/InputNode.cpp
     Source/StartingPointInputGem.cpp
     Source/StartingPointInput_precompiled.h
-    Source/StartingPointInput_precompiled.cpp
-
 )
diff --git a/Gems/StartingPointInput/Code/startingpointinput_files.cmake b/Gems/StartingPointInput/Code/startingpointinput_files.cmake
index 2208dff6b5..c330233722 100644
--- a/Gems/StartingPointInput/Code/startingpointinput_files.cmake
+++ b/Gems/StartingPointInput/Code/startingpointinput_files.cmake
@@ -27,5 +27,4 @@ set(FILES
     Source/InputHandlerNodeable.ScriptCanvasNodeable.xml
     Source/InputNode.ScriptCanvasGrammar.xml
     Source/StartingPointInput_precompiled.h
-    Source/StartingPointInput_precompiled.cpp
 )
diff --git a/Gems/StartingPointMovement/Code/CMakeLists.txt b/Gems/StartingPointMovement/Code/CMakeLists.txt
index 417dfe01ee..b9178dc839 100644
--- a/Gems/StartingPointMovement/Code/CMakeLists.txt
+++ b/Gems/StartingPointMovement/Code/CMakeLists.txt
@@ -9,21 +9,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #
 
-ly_add_target(
-    NAME StartingPointMovement.Static STATIC
-    NAMESPACE Gem
-    FILES_CMAKE
-        startingpointmovement_files.cmake
-    INCLUDE_DIRECTORIES
-        PRIVATE
-            Source
-        PUBLIC
-            Include
-    BUILD_DEPENDENCIES
-        PRIVATE
-            AZ::AzCore
-)
-
 ly_add_target(
     NAME StartingPointMovement ${PAL_TRAIT_MONOLITHIC_DRIVEN_MODULE_TYPE}
     NAMESPACE Gem
@@ -36,7 +21,6 @@ ly_add_target(
             Include
     BUILD_DEPENDENCIES
         PRIVATE
-            Gem::StartingPointMovement.Static
             AZ::AzCore
             AZ::AzFramework
 )
diff --git a/Gems/StartingPointMovement/Code/Source/StartingPointMovement_precompiled.cpp b/Gems/StartingPointMovement/Code/Source/StartingPointMovement_precompiled.cpp
deleted file mode 100644
index 7027e2ede1..0000000000
--- a/Gems/StartingPointMovement/Code/Source/StartingPointMovement_precompiled.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#include "StartingPointMovement_precompiled.h"
diff --git a/Gems/StartingPointMovement/Code/startingpointmovement_files.cmake b/Gems/StartingPointMovement/Code/startingpointmovement_files.cmake
deleted file mode 100644
index 21ce5801ac..0000000000
--- a/Gems/StartingPointMovement/Code/startingpointmovement_files.cmake
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(FILES
-    Include/StartingPointMovement/StartingPointMovementConstants.h
-    Include/StartingPointMovement/StartingPointMovementUtilities.h
-    Source/StartingPointMovement_precompiled.cpp
-    Source/StartingPointMovement_precompiled.h
-)
diff --git a/Gems/StartingPointMovement/Code/startingpointmovement_shared_files.cmake b/Gems/StartingPointMovement/Code/startingpointmovement_shared_files.cmake
index f6bc7b14ea..3fec69b2fe 100644
--- a/Gems/StartingPointMovement/Code/startingpointmovement_shared_files.cmake
+++ b/Gems/StartingPointMovement/Code/startingpointmovement_shared_files.cmake
@@ -11,4 +11,7 @@
 
 set(FILES
     Source/StartingPointMovementGem.cpp
+    Include/StartingPointMovement/StartingPointMovementConstants.h
+    Include/StartingPointMovement/StartingPointMovementUtilities.h
+    Source/StartingPointMovement_precompiled.h
 )
diff --git a/Gems/SurfaceData/Code/Source/SurfaceData_precompiled.cpp b/Gems/SurfaceData/Code/Source/SurfaceData_precompiled.cpp
deleted file mode 100644
index ce5861193f..0000000000
--- a/Gems/SurfaceData/Code/Source/SurfaceData_precompiled.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#include "SurfaceData_precompiled.h"
diff --git a/Gems/SurfaceData/Code/surfacedata_files.cmake b/Gems/SurfaceData/Code/surfacedata_files.cmake
index f906a12afc..20abf8d3ab 100644
--- a/Gems/SurfaceData/Code/surfacedata_files.cmake
+++ b/Gems/SurfaceData/Code/surfacedata_files.cmake
@@ -10,7 +10,6 @@
 #
 
 set(FILES
-    Source/SurfaceData_precompiled.cpp
     Source/SurfaceData_precompiled.h
     Include/SurfaceData/SurfaceDataConstants.h
     Include/SurfaceData/SurfaceDataTypes.h
diff --git a/Gems/TextureAtlas/Code/Source/TextureAtlas_precompiled.cpp b/Gems/TextureAtlas/Code/Source/TextureAtlas_precompiled.cpp
deleted file mode 100644
index 53e132032b..0000000000
--- a/Gems/TextureAtlas/Code/Source/TextureAtlas_precompiled.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include "TextureAtlas_precompiled.h"
diff --git a/Gems/TextureAtlas/Code/textureatlas_files.cmake b/Gems/TextureAtlas/Code/textureatlas_files.cmake
index c45c1d49a8..f96daa05d0 100644
--- a/Gems/TextureAtlas/Code/textureatlas_files.cmake
+++ b/Gems/TextureAtlas/Code/textureatlas_files.cmake
@@ -10,7 +10,6 @@
 #
 
 set(FILES
-    Source/TextureAtlas_precompiled.cpp
     Source/TextureAtlas_precompiled.h
     Include/TextureAtlas/TextureAtlasBus.h
     Include/TextureAtlas/TextureAtlasNotificationBus.h
diff --git a/Gems/TickBusOrderViewer/Code/Source/TickBusOrderViewer_precompiled.cpp b/Gems/TickBusOrderViewer/Code/Source/TickBusOrderViewer_precompiled.cpp
deleted file mode 100644
index aa7933d130..0000000000
--- a/Gems/TickBusOrderViewer/Code/Source/TickBusOrderViewer_precompiled.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#include "TickBusOrderViewer_precompiled.h"
diff --git a/Gems/TickBusOrderViewer/Code/tickbusorderviewer_files.cmake b/Gems/TickBusOrderViewer/Code/tickbusorderviewer_files.cmake
index ceae29ebe3..a4f0b2228b 100644
--- a/Gems/TickBusOrderViewer/Code/tickbusorderviewer_files.cmake
+++ b/Gems/TickBusOrderViewer/Code/tickbusorderviewer_files.cmake
@@ -10,7 +10,6 @@
 #
 
 set(FILES
-    Source/TickBusOrderViewer_precompiled.cpp
     Source/TickBusOrderViewer_precompiled.h
     Include/TickBusOrderViewer/TickBusOrderViewerBus.h
     Source/TickBusOrderViewerSystemComponent.cpp
diff --git a/Gems/Twitch/Code/Source/Twitch_precompiled.cpp b/Gems/Twitch/Code/Source/Twitch_precompiled.cpp
deleted file mode 100644
index 40f10ede34..0000000000
--- a/Gems/Twitch/Code/Source/Twitch_precompiled.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include "Twitch_precompiled.h"
diff --git a/Gems/Twitch/Code/lmbraws_unsupported_files.cmake b/Gems/Twitch/Code/lmbraws_unsupported_files.cmake
index 1fb36a4871..5c98bf6b97 100644
--- a/Gems/Twitch/Code/lmbraws_unsupported_files.cmake
+++ b/Gems/Twitch/Code/lmbraws_unsupported_files.cmake
@@ -10,7 +10,6 @@
 #
 
 set(FILES
-    Source/Twitch_precompiled.cpp
     Source/Twitch_precompiled.h
     Source/ComponentStub.cpp
 )
diff --git a/Gems/Twitch/Code/twitch_files.cmake b/Gems/Twitch/Code/twitch_files.cmake
index cba8e44961..f06ef55371 100644
--- a/Gems/Twitch/Code/twitch_files.cmake
+++ b/Gems/Twitch/Code/twitch_files.cmake
@@ -14,7 +14,6 @@ set(FILES
     Include/Twitch/TwitchTypes.h
     Include/Twitch/BaseTypes.h
     Include/Twitch/RESTTypes.h
-    Source/Twitch_precompiled.cpp
     Source/Twitch_precompiled.h
     Source/TwitchSystemComponent.cpp
     Source/TwitchSystemComponent.h
diff --git a/Gems/Vegetation/Code/Source/Vegetation_precompiled.cpp b/Gems/Vegetation/Code/Source/Vegetation_precompiled.cpp
deleted file mode 100644
index c8ed8a1b9d..0000000000
--- a/Gems/Vegetation/Code/Source/Vegetation_precompiled.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#include "Vegetation_precompiled.h"
diff --git a/Gems/Vegetation/Code/vegetation_files.cmake b/Gems/Vegetation/Code/vegetation_files.cmake
index ff741902e2..abfd568862 100644
--- a/Gems/Vegetation/Code/vegetation_files.cmake
+++ b/Gems/Vegetation/Code/vegetation_files.cmake
@@ -10,7 +10,6 @@
 #
 
 set(FILES
-    Source/Vegetation_precompiled.cpp
     Source/Vegetation_precompiled.h
     Include/Vegetation/DescriptorListAsset.h
     Include/Vegetation/Descriptor.h
diff --git a/Gems/VirtualGamepad/Code/Source/VirtualGamepad_precompiled.cpp b/Gems/VirtualGamepad/Code/Source/VirtualGamepad_precompiled.cpp
deleted file mode 100644
index 8049f28d48..0000000000
--- a/Gems/VirtualGamepad/Code/Source/VirtualGamepad_precompiled.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include "VirtualGamepad_precompiled.h"
diff --git a/Gems/VirtualGamepad/Code/virtualgamepad_files.cmake b/Gems/VirtualGamepad/Code/virtualgamepad_files.cmake
index 8d026b7dbb..874d6252a2 100644
--- a/Gems/VirtualGamepad/Code/virtualgamepad_files.cmake
+++ b/Gems/VirtualGamepad/Code/virtualgamepad_files.cmake
@@ -10,7 +10,6 @@
 #
 
 set(FILES
-    Source/VirtualGamepad_precompiled.cpp
     Source/VirtualGamepad_precompiled.h
     Include/VirtualGamepad/VirtualGamepadBus.h
     Source/InputDeviceVirtualGamepad.cpp
diff --git a/Gems/WhiteBox/Code/Source/WhiteBoxUnsupported_precompiled.cpp b/Gems/WhiteBox/Code/Source/WhiteBoxUnsupported_precompiled.cpp
deleted file mode 100644
index 611ac1f0a1..0000000000
--- a/Gems/WhiteBox/Code/Source/WhiteBoxUnsupported_precompiled.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
- * its licensors.
- *
- * For complete copyright and license terms please see the LICENSE at the root of this
- * distribution (the "License"). All use of this software is governed by the License,
- * or, if provided, by the license below or the license accompanying this file. Do not
- * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *
- */
-
-#include <WhiteBoxUnsupported_precompiled.h>
diff --git a/Gems/WhiteBox/Code/Source/WhiteBox_precompiled.cpp b/Gems/WhiteBox/Code/Source/WhiteBox_precompiled.cpp
deleted file mode 100644
index 892230742f..0000000000
--- a/Gems/WhiteBox/Code/Source/WhiteBox_precompiled.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
- * its licensors.
- *
- * For complete copyright and license terms please see the LICENSE at the root of this
- * distribution (the "License"). All use of this software is governed by the License,
- * or, if provided, by the license below or the license accompanying this file. Do not
- * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *
- */
-
-#include "WhiteBox_precompiled.h"
diff --git a/Gems/WhiteBox/Code/whitebox_supported_files.cmake b/Gems/WhiteBox/Code/whitebox_supported_files.cmake
index 41aa4433cc..372f8cee45 100644
--- a/Gems/WhiteBox/Code/whitebox_supported_files.cmake
+++ b/Gems/WhiteBox/Code/whitebox_supported_files.cmake
@@ -10,7 +10,6 @@
 #
 
 set(FILES
-    Source/WhiteBox_precompiled.cpp
     Source/WhiteBox_precompiled.h
     Include/WhiteBox/WhiteBoxBus.h
     Source/WhiteBoxAllocator.cpp
diff --git a/Gems/WhiteBox/Code/whitebox_unsupported_files.cmake b/Gems/WhiteBox/Code/whitebox_unsupported_files.cmake
index a44907e1be..3dca84c067 100644
--- a/Gems/WhiteBox/Code/whitebox_unsupported_files.cmake
+++ b/Gems/WhiteBox/Code/whitebox_unsupported_files.cmake
@@ -11,6 +11,5 @@
 
 set(FILES
     Source/WhiteBoxModuleUnsupported.cpp
-    Source/WhiteBoxUnsupported_precompiled.cpp
     Source/WhiteBoxUnsupported_precompiled.h
 )
diff --git a/Tools/LyTestTools/ly_test_tools/o3de/asset_processor.py b/Tools/LyTestTools/ly_test_tools/o3de/asset_processor.py
index 8e2b93c20a..a9c9a2fa5b 100644
--- a/Tools/LyTestTools/ly_test_tools/o3de/asset_processor.py
+++ b/Tools/LyTestTools/ly_test_tools/o3de/asset_processor.py
@@ -597,9 +597,10 @@ class AssetProcessor(object):
         run_result = subprocess.run(command, close_fds=True, timeout=timeout, capture_output=capture_output)
         output_list = None
         if capture_output:
-            output_list = run_result.stdout.splitlines()
             if decode:
-                output_list = [line.decode('utf-8') for line in output_list]
+                output_list = run_result.stdout.decode('utf-8').splitlines()
+            else:
+                output_list = run_result.stdout.splitlines()
 
         if run_result.returncode != 0:
             errorMessage = f"{command} returned error code: {run_result.returncode}"
diff --git a/cmake/Packaging.cmake b/cmake/Packaging.cmake
index 3e23511fa1..6c077ac617 100644
--- a/cmake/Packaging.cmake
+++ b/cmake/Packaging.cmake
@@ -16,6 +16,9 @@ endif()
 # public facing options will be used for conversion into cpack specific ones below.
 set(LY_INSTALLER_DOWNLOAD_URL "" CACHE STRING "URL embedded into the installer to download additional artifacts")
 set(LY_INSTALLER_LICENSE_URL "" CACHE STRING "Optionally embed a link to the license instead of raw text")
+set(LY_INSTALLER_UPLOAD_URL "" CACHE STRING
+    "URL used to automatically upload the artifacts.  Can also be set via LY_INSTALLER_UPLOAD_URL environment variable.  Currently only accepts S3 URLs e.g. s3://<bucket>/<prefix>")
+set(LY_INSTALLER_AWS_PROFILE "" CACHE STRING "AWS CLI profile for uploading artifacts.  Can also be set via LY_INSTALLER_AWS_PROFILE environment variable.")
 
 set(CPACK_DESIRED_CMAKE_VERSION 3.20.2)
 
@@ -103,6 +106,45 @@ install(FILES ${_cmake_package_dest}
     DESTINATION ./Tools/Redistributables/CMake
 )
 
+# checks for and removes trailing slash
+function(strip_trailing_slash in_url out_url)
+    string(LENGTH ${in_url} _url_length)
+    MATH(EXPR _url_length "${_url_length}-1")
+
+    string(SUBSTRING ${in_url} 0 ${_url_length} _clean_url)
+    if("${in_url}" STREQUAL "${_clean_url}/")
+        set(${out_url} ${_clean_url} PARENT_SCOPE)
+    else()
+        set(${out_url} ${in_url} PARENT_SCOPE)
+    endif()
+endfunction()
+
+set(_versioned_target_url_tag ${LY_VERSION_STRING}/${PAL_HOST_PLATFORM_NAME})
+
+if(NOT LY_INSTALLER_UPLOAD_URL AND DEFINED ENV{LY_INSTALLER_UPLOAD_URL})
+    set(LY_INSTALLER_UPLOAD_URL $ENV{LY_INSTALLER_UPLOAD_URL})
+endif()
+
+if(LY_INSTALLER_UPLOAD_URL)
+    ly_is_s3_url(${LY_INSTALLER_UPLOAD_URL} _is_s3_bucket)
+    if(NOT _is_s3_bucket)
+        message(FATAL_ERROR "Only S3 installer uploading is supported at this time")
+    endif()
+
+    if (LY_INSTALLER_AWS_PROFILE)
+        set(CPACK_AWS_PROFILE ${LY_INSTALLER_AWS_PROFILE})
+    elseif (DEFINED ENV{LY_INSTALLER_AWS_PROFILE})
+        set(CPACK_AWS_PROFILE $ENV{LY_INSTALLER_AWS_PROFILE})
+    else()
+        message(FATAL_ERROR
+            "An AWS profile is required for installer S3 uploading.  Please provide "
+            "one via LY_INSTALLER_AWS_PROFILE CLI argument or environment variable")
+    endif()
+
+    strip_trailing_slash(${LY_INSTALLER_UPLOAD_URL} LY_INSTALLER_UPLOAD_URL)
+    set(CPACK_UPLOAD_URL ${LY_INSTALLER_UPLOAD_URL}/${_versioned_target_url_tag})
+endif()
+
 # IMPORTANT: required to be included AFTER setting all property overrides
 include(CPack REQUIRED)
 
@@ -146,9 +188,11 @@ ly_configure_cpack_component(
 )
 
 if(LY_INSTALLER_DOWNLOAD_URL)
-    # this will set the following variables: CPACK_DOWNLOAD_SITE, CPACK_DOWNLOAD_ALL, and CPACK_UPLOAD_DIRECTORY
+    strip_trailing_slash(${LY_INSTALLER_DOWNLOAD_URL} LY_INSTALLER_DOWNLOAD_URL)
+
+    # this will set the following variables: CPACK_DOWNLOAD_SITE, CPACK_DOWNLOAD_ALL, and CPACK_UPLOAD_DIRECTORY (local)
     cpack_configure_downloads(
-        ${LY_INSTALLER_DOWNLOAD_URL}
+        ${LY_INSTALLER_DOWNLOAD_URL}/${_versioned_target_url_tag}
         UPLOAD_DIRECTORY ${CMAKE_BINARY_DIR}/_CPack_Uploads # to match the _CPack_Packages directory
         ALL
     )
diff --git a/cmake/Platform/Windows/PackagingPostBuild.cmake b/cmake/Platform/Windows/PackagingPostBuild.cmake
index d379358bf4..89b3efb44b 100644
--- a/cmake/Platform/Windows/PackagingPostBuild.cmake
+++ b/cmake/Platform/Windows/PackagingPostBuild.cmake
@@ -59,12 +59,21 @@ set(_light_command
 message(STATUS "Creating Bootstrap Installer...")
 execute_process(
     COMMAND ${_candle_command}
-    COMMAND_ERROR_IS_FATAL ANY
+    RESULT_VARIABLE _candle_result
+    ERROR_VARIABLE _candle_errors
 )
+if(NOT ${_candle_result} EQUAL 0)
+    message(FATAL_ERROR "An error occurred invoking candle.exe.  ${_candle_errors}")
+endif()
+
 execute_process(
     COMMAND ${_light_command}
-    COMMAND_ERROR_IS_FATAL ANY
+    RESULT_VARIABLE _light_result
+    ERROR_VARIABLE _light_errors
 )
+if(NOT ${_light_result} EQUAL 0)
+    message(FATAL_ERROR "An error occurred invoking light.exe.  ${_light_errors}")
+endif()
 
 file(COPY ${_bootstrap_output_file}
     DESTINATION ${CPACK_PACKAGE_DIRECTORY}
@@ -87,3 +96,42 @@ file(COPY ${_artifacts}
     DESTINATION ${CPACK_UPLOAD_DIRECTORY}
 )
 message(STATUS "Artifacts copied to ${CPACK_UPLOAD_DIRECTORY}")
+
+if(NOT CPACK_UPLOAD_URL)
+    return()
+endif()
+
+file(REAL_PATH "${CPACK_SOURCE_DIR}/.." _root_path)
+
+file(TO_NATIVE_PATH "${_root_path}/python/python.cmd" _python_cmd)
+file(TO_NATIVE_PATH "${_root_path}/scripts/build/tools/upload_to_s3.py" _upload_script)
+file(TO_NATIVE_PATH "${_cpack_wix_out_dir}" _cpack_wix_out_dir)
+
+# strip the scheme and extract the bucket/key prefix from the URL
+string(REPLACE "s3://" "" _stripped_url ${CPACK_UPLOAD_URL})
+string(REPLACE "/" ";" _tokens ${_stripped_url})
+
+list(POP_FRONT _tokens _bucket)
+string(JOIN "/" _prefix ${_tokens})
+
+set(_file_regex ".*(cab|exe|msi)$")
+
+set(_upload_command
+    ${_python_cmd} -s
+    -u ${_upload_script}
+    --base_dir ${_cpack_wix_out_dir}
+    --file_regex="${_file_regex}"
+    --bucket ${_bucket}
+    --key_prefix ${_prefix}
+    --profile ${CPACK_AWS_PROFILE}
+)
+
+execute_process(
+    COMMAND ${_upload_command}
+    RESULT_VARIABLE _upload_result
+    ERROR_VARIABLE _upload_errors
+)
+
+if (NOT ${_upload_result} EQUAL 0)
+    message(FATAL_ERROR "An error occurred uploading artifacts.  ${_upload_errors}")
+endif()
diff --git a/cmake/Tools/Platform/iOS/build_ios_test.py b/cmake/Tools/Platform/iOS/build_ios_test.py
index 1de24a79f5..c02f1efd1b 100755
--- a/cmake/Tools/Platform/iOS/build_ios_test.py
+++ b/cmake/Tools/Platform/iOS/build_ios_test.py
@@ -15,6 +15,7 @@ import pathlib
 import sys
 
 SCHEME_NAME = 'AzTestRunner'
+XCODE_PROJECT_NAME = 'O3DE'
 
 # Resolve the common python module
 ROOT_DEV_PATH = os.path.realpath(os.path.join(os.path.dirname(__file__), '..', '..', '..', '..'))
@@ -30,7 +31,7 @@ def build_ios_test(build_dir, configuration):
     
     xcode_build = common.CommandLineExec('/usr/bin/xcodebuild')
     command_line_arguments = ['build-for-testing',
-                              '-project', 'Lumberyard.xcodeproj',
+                              '-project', f'{XCODE_PROJECT_NAME}.xcodeproj',
                               '-scheme', SCHEME_NAME,
                               '-configuration', configuration,
                               '-allowProvisioningUpdates',
@@ -55,7 +56,7 @@ def main(args):
     parsed_args = parser.parse_args(args)
 
     build_ios_test(build_dir=parsed_args.build_dir,
-                                 configuration=parsed_args.configuration)
+                   configuration=parsed_args.configuration)
     return 0
 
 
diff --git a/cmake/Tools/Platform/iOS/launch_ios_test.py b/cmake/Tools/Platform/iOS/launch_ios_test.py
index f34b6f68b1..19cdd8b91b 100755
--- a/cmake/Tools/Platform/iOS/launch_ios_test.py
+++ b/cmake/Tools/Platform/iOS/launch_ios_test.py
@@ -11,17 +11,22 @@
 
 import argparse
 import glob
+import json
 import logging
 import os
 import pathlib
 import plistlib
+import re
 import sys
+import time
 
 TEST_TARGET_NAME = 'TestLauncherTarget'
 TEST_STARTED_STRING = 'TEST STARTED'
 TEST_SUCCESS_STRING = 'TEST SUCCEEDED'
 TEST_FAILURE_STRING = 'TEST FAILED'
 
+TEST_RUN_SEARCH_PATTERN=re.compile(r'^\[\s*([a-zA-Z0-9]*\s*)\]\s*([a-zA-Z0-9\.\s]*)(\(.*\))')
+
 # Resolve the common python module
 ROOT_DEV_PATH = os.path.realpath(os.path.join(os.path.dirname(__file__), '..', '..', '..', '..'))
 if ROOT_DEV_PATH not in sys.path:
@@ -29,7 +34,7 @@ if ROOT_DEV_PATH not in sys.path:
 
 from cmake.Tools import common
 
-def launch_ios_test(build_dir, target_dev_name, test_target, timeout_secs, test_filter, xctestrun_file):
+def launch_ios_test(build_dir, target_dev_name, test_target, timeout_secs, test_filter, xctestrun_file, test_report_json_file):
     
     build_path = pathlib.Path(build_dir) if os.path.isabs(build_dir) else pathlib.Path(ROOT_DEV_PATH) / build_dir
     if not build_path.is_dir():
@@ -57,6 +62,11 @@ def launch_ios_test(build_dir, target_dev_name, test_target, timeout_secs, test_
     test_targets = common.get_validated_test_modules(test_modules=test_target, build_dir_path=build_path)
 
     test_run_contents = []
+    test_case_successes = []
+    test_case_fails = []
+    crashed_test_modules = []
+    test_case_count = 0
+
     with open(test_run_file, 'rb') as fp:
         test_run_contents = plistlib.load(fp)
         
@@ -74,7 +84,7 @@ def launch_ios_test(build_dir, target_dev_name, test_target, timeout_secs, test_
         with open(test_run_file, 'wb') as fp:
             plistlib.dump(test_run_contents, fp, sort_keys=False)
         
-        xcode_args = ['test-without-building', '-xctestrun', test_run_file, '-destination', f'platform=iOS,name={target_dev_name}']
+        xcode_args = ['test-without-building', '-xctestrun', test_run_file, '-destination', f'platform=iOS,name={target_dev_name}', '-allowProvisioningUpdates', '-allowProvisioningDeviceRegistration']
         if timeout_secs < 0:
             xcode_args.extend(['-test-timeouts-enabled', 'NO'])
         else:
@@ -89,6 +99,22 @@ def launch_ios_test(build_dir, target_dev_name, test_target, timeout_secs, test_
         test_output = False
         while xcode_out.poll() is None:
             line = xcode_out.stdout.readline()
+            if line.startswith('** TEST EXECUTE FAILED **'):
+                # The test run crashed, so we need to track the failed test module
+                crashed_test_modules.append(target)
+            else:
+                matched = TEST_RUN_SEARCH_PATTERN.search(line)
+                if matched:
+                    test_case_action = matched.group(1).strip()
+                    test_case_name = matched.group(2).strip()
+                    test_case_elapsed = matched.group(3).strip() if len(matched.groups()) > 2 else ''
+                    if test_case_action == 'OK':
+                        test_case_successes.append(f'{test_case_name} {test_case_elapsed}')
+                        test_case_count += 1
+                    elif test_case_action == 'FAILED' and 'listed below:' not in test_case_name:
+                        test_case_fails.append(f'{test_case_name} {test_case_elapsed}')
+                        test_case_count += 1
+
             if TEST_STARTED_STRING in line:
                 test_output = True
             
@@ -99,11 +125,32 @@ def launch_ios_test(build_dir, target_dev_name, test_target, timeout_secs, test_
                 test_output = False
                 
             if test_output:
-                print(line)
+                print(line, end='')
             else:
                 logging.debug(line)
             
-        print(f'{target} Succeeded') if test_success else print(f'{target} Failed')
+        logging.info(f'{target} Succeeded') if test_success else print(f'{target} Failed')
+
+    if test_report_json_file:
+        test_report_json_path = pathlib.Path(test_report_json_file)
+        test_timestamp = time.strftime("%Y-%m-%dT%H:%M:%SZ", time.localtime())
+        result_dict = {
+            'index': 'ly_platforms.test',
+            'payload': {
+                'Git Success': True,
+                'Build Success': True,
+                'Passed': test_case_successes,
+                'Failed': test_case_fails,
+                'CrashedModules': crashed_test_modules,
+                'Count': test_case_count
+            },
+            'pipeline': 'filebeat',
+            'timestamp': test_timestamp
+        }
+        result_json = json.dumps(result_dict, indent=4)
+        test_report_json_path.write_text(result_json, encoding='UTF-8', errors='ignore')
+        logging.info(f'MARS report saved to {test_report_json_path}')
+        logging.info(f"MARS report:\n{result_json}")
 
 
 def main(args):
@@ -140,20 +187,24 @@ def main(args):
                         help='Enable debug logging',
                         action='store_true')
 
+    parser.add_argument('--test-report-json',
+                        help='The optional path to the test report json file that will be generated for MARS reporting',
+                        default=None)
+
     parsed_args = parser.parse_args(args)
 
     logging.basicConfig(format='%(levelname)s: %(message)s',
                         level=logging.DEBUG if parsed_args.debug else logging.INFO)
 
     result = launch_ios_test(build_dir=parsed_args.build_dir,
-                                 target_dev_name=parsed_args.device_name,
-                                 test_target=parsed_args.test_module,
-                                 timeout_secs=int(parsed_args.timeout),
-                                 test_filter=parsed_args.test_filter,
-                                 xctestrun_file=parsed_args.xctestrun_file)
+                             target_dev_name=parsed_args.device_name,
+                             test_target=parsed_args.test_module,
+                             timeout_secs=int(parsed_args.timeout),
+                             test_filter=parsed_args.test_filter,
+                             xctestrun_file=parsed_args.xctestrun_file,
+                             test_report_json_file=parsed_args.test_report_json)
     return 0 if result else 1
 
-
 if __name__ == '__main__':
 
     try:
diff --git a/scripts/build/Jenkins/Jenkinsfile b/scripts/build/Jenkins/Jenkinsfile
index 3cf7d92ba6..693cf31727 100644
--- a/scripts/build/Jenkins/Jenkinsfile
+++ b/scripts/build/Jenkins/Jenkinsfile
@@ -366,6 +366,9 @@ def ExportTestResults(Map options, String platform, String type, String workspac
         dir("${o3deroot}/${params.OUTPUT_DIRECTORY}") {
             junit testResults: "Testing/**/*.xml"
             palRmDir("Testing")
+            // Recreate test runner xml directories that need to be pre generated
+            palMkdir("Testing/Pytest")
+            palMkdir("Testing/Gtest")
         }
     }
 }
@@ -578,14 +581,12 @@ finally {
             )
         }
         node('controller') {
-            emailRecipients = [[$class: 'RequesterRecipientProvider']]
-            if (env.WATCHED_BRANCHES.tokenize(',').contains(branchName)) {
-                emailRecipients.add([$class: 'CulpritsRecipientProvider'])
-            }
             step([
-                $class: 'Mailer', 
-                notifyEveryUnstableBuild: true, 
-                recipients: emailextrecipients(emailRecipients)
+                $class: 'Mailer',
+                notifyEveryUnstableBuild: true,
+                recipients: emailextrecipients([
+                    [$class: 'RequesterRecipientProvider']
+                ])
             ])
         }
     } catch(Exception e) {
diff --git a/scripts/build/Platform/Linux/build_config.json b/scripts/build/Platform/Linux/build_config.json
index ee6da77b29..660bc50da6 100644
--- a/scripts/build/Platform/Linux/build_config.json
+++ b/scripts/build/Platform/Linux/build_config.json
@@ -24,7 +24,7 @@
     "COMMAND": "python_linux.sh",
     "PARAMETERS": {
       "SCRIPT_PATH": "scripts/build/ci_build_metrics.py",
-      "SCRIPT_PARAMETERS": "--platform Linux --jobname '${JOB_NAME}' --jobnumber '${BUILD_NUMBER}' --jobnode '${NODE_NAME}' --changelist '${CHANGE_ID}'"
+      "SCRIPT_PARAMETERS": "--platform Linux --jobname=\\'${JOB_NAME}\\' --jobnumber \\'${BUILD_NUMBER}\\' --jobnode \\'${NODE_LABEL}\\' --changelist \\'${CHANGE_ID}\\'"
     }
   },
   "debug": {
diff --git a/scripts/build/Platform/Linux/python_linux.sh b/scripts/build/Platform/Linux/python_linux.sh
index 6e1bd73b36..0fe205fcc2 100755
--- a/scripts/build/Platform/Linux/python_linux.sh
+++ b/scripts/build/Platform/Linux/python_linux.sh
@@ -12,5 +12,5 @@
 
 set -o errexit # exit on the first failure encountered
 
-echo [ci_build] python/python.sh -u ${SCRIPT_PATH} ${SCRIPT_PARAMETERS}
-python/python.sh -u ${SCRIPT_PATH} ${SCRIPT_PARAMETERS}
\ No newline at end of file
+echo [ci_build] python/python.sh -u ${SCRIPT_PATH} $(eval echo ${SCRIPT_PARAMETERS})
+python/python.sh -u ${SCRIPT_PATH} $(eval echo ${SCRIPT_PARAMETERS})
\ No newline at end of file
diff --git a/scripts/build/Platform/Mac/build_config.json b/scripts/build/Platform/Mac/build_config.json
index 971e5e47a1..c02227c613 100644
--- a/scripts/build/Platform/Mac/build_config.json
+++ b/scripts/build/Platform/Mac/build_config.json
@@ -24,7 +24,7 @@
     "COMMAND": "python_mac.sh",
     "PARAMETERS": {
       "SCRIPT_PATH": "scripts/build/ci_build_metrics.py",
-      "SCRIPT_PARAMETERS": "--platform Mac --jobname '${JOB_NAME}' --jobnumber '${BUILD_NUMBER}' --jobnode '${NODE_NAME}' --changelist '${CHANGE_ID}'"
+      "SCRIPT_PARAMETERS": "--platform Mac --jobname \\'${JOB_NAME}\\' --jobnumber \\'${BUILD_NUMBER}\\' --jobnode \\'${NODE_LABEL}\\' --changelist \\'${CHANGE_ID}\\'"
     }
   },
   "debug": {
diff --git a/scripts/build/Platform/Mac/python_mac.sh b/scripts/build/Platform/Mac/python_mac.sh
index 6e1bd73b36..0fe205fcc2 100755
--- a/scripts/build/Platform/Mac/python_mac.sh
+++ b/scripts/build/Platform/Mac/python_mac.sh
@@ -12,5 +12,5 @@
 
 set -o errexit # exit on the first failure encountered
 
-echo [ci_build] python/python.sh -u ${SCRIPT_PATH} ${SCRIPT_PARAMETERS}
-python/python.sh -u ${SCRIPT_PATH} ${SCRIPT_PARAMETERS}
\ No newline at end of file
+echo [ci_build] python/python.sh -u ${SCRIPT_PATH} $(eval echo ${SCRIPT_PARAMETERS})
+python/python.sh -u ${SCRIPT_PATH} $(eval echo ${SCRIPT_PARAMETERS})
\ No newline at end of file
diff --git a/scripts/build/Platform/Windows/build_config.json b/scripts/build/Platform/Windows/build_config.json
index 552ef2c6fd..71abf9021f 100644
--- a/scripts/build/Platform/Windows/build_config.json
+++ b/scripts/build/Platform/Windows/build_config.json
@@ -56,7 +56,7 @@
     "COMMAND": "python_windows.cmd",
     "PARAMETERS": {
       "SCRIPT_PATH": "scripts/build/ci_build_metrics.py",
-      "SCRIPT_PARAMETERS": "--platform Windows --jobname \"!JOB_NAME!\" --jobnumber \"!BUILD_NUMBER!\" --jobnode \"!NODE_NAME!\" --changelist \"!CHANGE_ID!\""
+      "SCRIPT_PARAMETERS": "--platform Windows --jobname \"!JOB_NAME!\" --jobnumber \"!BUILD_NUMBER!\" --jobnode \"!NODE_LABEL!\" --changelist \"!CHANGE_ID!\""
     }
   },
   "windows_packaging_all": {
diff --git a/scripts/build/Platform/iOS/build_config.json b/scripts/build/Platform/iOS/build_config.json
index 2d9c57f6ee..e0f59a72be 100644
--- a/scripts/build/Platform/iOS/build_config.json
+++ b/scripts/build/Platform/iOS/build_config.json
@@ -14,7 +14,7 @@
     "COMMAND": "../Mac/python_mac.sh",
     "PARAMETERS": {
       "SCRIPT_PATH": "scripts/build/ci_build_metrics.py",
-      "SCRIPT_PARAMETERS": "--platform iOS --jobname '${JOB_NAME}' --jobnumber '${BUILD_NUMBER}' --jobnode '${NODE_NAME}' --changelist '${CHANGE_ID}'"
+      "SCRIPT_PARAMETERS": "--platform iOS --jobname '${JOB_NAME}' --jobname \\'${JOB_NAME}\\' --jobnumber \\'${BUILD_NUMBER}\\' --jobnode \\'${NODE_LABEL}\\' --changelist \\'${CHANGE_ID}\\'"
     }
   },
   "debug": {
@@ -99,5 +99,24 @@
       "CMAKE_TARGET": "ALL_BUILD",
       "CMAKE_NATIVE_BUILD_ARGS": "-destination generic/platform=iOS"
     }
+  },
+  "device_test_profile": {
+    "TAGS": [
+    ],
+    "PIPELINE_ENV":{
+      "NODE_LABEL":"Catalina_DeviceFarm_1",
+      "LY_3RDPARTY_PATH": "/Volumes/Data/jenkins/3rdParty",
+      "WORKSPACE": "/Volumes/Data/jenkins/workspace"
+    },
+    "COMMAND": "./build_ios_test.sh",
+    "PARAMETERS": {
+      "CONFIGURATION": "profile",
+      "OUTPUT_DIRECTORY": "build/ios_test",
+      "CMAKE_OPTIONS": "-G Xcode -DCMAKE_TOOLCHAIN_FILE=cmake/Platform/iOS/Toolchain_ios.cmake -DLY_MONOLITHIC_GAME=FALSE -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED=TRUE -DLY_IOS_CODE_SIGNING_IDENTITY=\"\"  -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS=\"\" -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED=TRUE -DLY_UNITY_BUILD=TRUE -DO3DE_HOME_PATH=\"${WORKSPACE}/home\" -DO3DE_REGISTER_ENGINE_PATH=\"${WORKSPACE}/o3de\" -DO3DE_REGISTER_THIS_ENGINE=TRUE",
+      "CMAKE_TARGET": "ALL_BUILD",
+      "CMAKE_NATIVE_BUILD_ARGS": "",
+      "TARGET_DEVICE_NAME": "Lumberyard",
+      "TEST_MODULE_TIMEOUT": "600"
+    }
   }
 }
diff --git a/scripts/build/Platform/iOS/build_ios_test.sh b/scripts/build/Platform/iOS/build_ios_test.sh
new file mode 100755
index 0000000000..11733fb922
--- /dev/null
+++ b/scripts/build/Platform/iOS/build_ios_test.sh
@@ -0,0 +1,76 @@
+#!/usr/bin/env bash
+#
+# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+# its licensors.
+#
+# For complete copyright and license terms please see the LICENSE at the root of this
+# distribution (the "License"). All use of this software is governed by the License,
+# or, if provided, by the license below or the license accompanying this file. Do not
+# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#
+
+set -o errexit # exit on the first failure encountered
+
+BASEDIR=$(dirname "$0")
+source $BASEDIR/../Mac/env_mac.sh
+
+mkdir -p ${OUTPUT_DIRECTORY}
+SOURCE_DIRECTORY=${PWD}
+
+
+ECHO Configuring for iOS Testing
+
+LAST_CONFIGURE_CMD_FILE=ci_last_configure_cmd.txt
+CONFIGURE_CMD="cmake -B ${OUTPUT_DIRECTORY} ${SOURCE_DIRECTORY} ${CMAKE_OPTIONS} ${EXTRA_CMAKE_OPTIONS} -DLY_3RDPARTY_PATH=${LY_3RDPARTY_PATH}"
+if [[ ! -e "CMakeCache.txt" ]]; then
+    echo [ci_build] First run, generating
+    RUN_CONFIGURE=1
+elif [[ ! -e ${LAST_CONFIGURE_CMD_FILE} ]]; then
+    echo [ci_build] Last run command not found, generating
+    RUN_CONFIGURE=1
+else
+    # Detect if the input has changed
+    LAST_CMD=$(<${LAST_CONFIGURE_CMD_FILE})
+    if [[ "${LAST_CMD}" != "${CONFIGURE_CMD}" ]]; then
+        echo [ci_build] Last run command different, generating
+        RUN_CONFIGURE=1
+    fi
+fi
+if [[ ! -z "$RUN_CONFIGURE" ]]; then
+    # have to use eval since $CMAKE_OPTIONS (${EXTRA_CMAKE_OPTIONS}) contains quotes that need to be processed
+    echo [ci_build] ${CONFIGURE_CMD}
+    eval ${CONFIGURE_CMD}
+    # Save the run only if success
+    echo "${CONFIGURE_CMD}" > ${LAST_CONFIGURE_CMD_FILE}
+fi
+
+if [ $? -ne 0 ]
+then
+    echo "CMake configuration failed"
+    exit 1
+fi
+
+echo Building for iOS Testing
+echo
+echo [ci+build] ${SOURCE_DIRECTORY}/python/python.sh ${SOURCE_DIRECTORY}/cmake/Tools/Platform/iOS/build_ios_test.py -b ${OUTPUT_DIRECTORY} -c ${CONFIGURATION}
+${SOURCE_DIRECTORY}/python/python.sh ${SOURCE_DIRECTORY}/cmake/Tools/Platform/iOS/build_ios_test.py -b ${OUTPUT_DIRECTORY} -c ${CONFIGURATION} 
+if [ $? -ne 0 ]
+then
+    echo "iOS Test Build failed"
+    exit 1
+fi
+
+ECHO Launching iOS Test
+echo [ci+build] ${SOURCE_DIRECTORY}/python/python.sh ${SOURCE_DIRECTORY}/cmake/Tools/Platform/iOS/launch_ios_test.py -b ${OUTPUT_DIRECTORY} --device-name ${TARGET_DEVICE_NAME} --timeout ${TEST_MODULE_TIMEOUT}
+${SOURCE_DIRECTORY}/python/python.sh ${SOURCE_DIRECTORY}/cmake/Tools/Platform/iOS/launch_ios_test.py -b ${OUTPUT_DIRECTORY} --device-name ${TARGET_DEVICE_NAME} --timeout ${TEST_MODULE_TIMEOUT}
+
+if [ $? -ne 0 ]
+then
+    echo "iOS Test failed"
+    exit 1
+fi
+
+echo "iOS Tests passed"
+exit 0
+
diff --git a/scripts/build/tools/upload_to_s3.py b/scripts/build/tools/upload_to_s3.py
index d6d6d8ddb5..5dfe5eb66e 100755
--- a/scripts/build/tools/upload_to_s3.py
+++ b/scripts/build/tools/upload_to_s3.py
@@ -65,6 +65,11 @@ def get_client(service_name, profile_name):
 def get_files_to_upload(base_dir, regex):
     # Get all file names in base directory
     files = [x for x in os.listdir(base_dir) if os.path.isfile(os.path.join(base_dir, x))]
+    # strip the surround quotes, if they exist
+    try:
+        regex = json.loads(regex)
+    except:
+        pass
     # Get all file names matching the regular expression, those file will be uploaded to S3
     files_to_upload = [x for x in files if re.match(regex, x)]
     return files_to_upload
diff --git a/scripts/o3de/o3de/project_properties.py b/scripts/o3de/o3de/project_properties.py
index 69bd1b9406..52f1346b51 100644
--- a/scripts/o3de/o3de/project_properties.py
+++ b/scripts/o3de/o3de/project_properties.py
@@ -30,7 +30,7 @@ def get_project_props(name: str = None, path: pathlib.Path = None) -> dict:
     return proj_json
 
 def edit_project_props(proj_path, proj_name, new_origin, new_display,
-                       new_summary, new_icon, new_tag, remove_tag) -> int:
+                       new_summary, new_icon, new_tags, delete_tags, replace_tags) -> int:
     proj_json = get_project_props(proj_name, proj_path)
     
     if not proj_json:
@@ -44,16 +44,22 @@ def edit_project_props(proj_path, proj_name, new_origin, new_display,
         proj_json['summary'] = new_summary
     if new_icon:
         proj_json['icon_path'] = new_icon
-    if new_tag:
-        proj_json.setdefault('user_tags', []).append(new_tag)
-    if remove_tag:
+    if new_tags:
+        tag_list = [new_tags] if isinstance(new_tags, str) else new_tags
+        proj_json.setdefault('user_tags', []).extend(tag_list)
+    if delete_tags:
+        removal_list = [delete_tags] if isinstance(delete_tags, str) else delete_tags
         if 'user_tags' in proj_json:
-            if remove_tag in proj_json['user_tags']:
-                proj_json['user_tags'].remove(remove_tag)
-            else:
-                logger.warn(f'{remove_tag} not found in user_tags for removal.')
+            for tag in removal_list:
+                if tag in proj_json['user_tags']:
+                    proj_json['user_tags'].remove(tag)
+                else:
+                    logger.warn(f'{tag} not found in user_tags for removal.')
         else:
-            logger.warn(f'user_tags property not found for removal of tag {remove_tag}.')
+            logger.warn(f'user_tags property not found for removal of {remove_tags}.')
+    if replace_tags:
+        tag_list = [replace_tags] if isinstance(replace_tags, str) else replace_tags
+        proj_json['user_tags'] = tag_list
 
     manifest.save_o3de_manifest(proj_json, pathlib.Path(proj_path) / 'project.json')
     return 0
@@ -65,8 +71,9 @@ def _edit_project_props(args: argparse) -> int:
                                args.project_display,
                                args.project_summary,
                                args.project_icon,
-                               args.project_tag,
-                               args.remove_tag)
+                               args.add_tags,
+                               args.delete_tags,
+                               args.replace_tags)
 
 def add_parser_args(parser):
     group = parser.add_mutually_exclusive_group(required=True)
@@ -83,10 +90,13 @@ def add_parser_args(parser):
                        help='Sets the summary description of the project.')
     group.add_argument('-pi', '--project-icon', type=str, required=False,
                        help='Sets the path to the projects icon resource.')
-    group.add_argument('-pt', '--project-tag', type=str, required=False,
-                       help='Adds a tag to user_tags property. These tags are intended for documentation and filtering.')
-    group.add_argument('-rt', '--remove-tag', type=str, required=False,
-                       help='Removes a tag from the user_tags property.')
+    group = parser.add_mutually_exclusive_group(required=False)
+    group.add_argument('-at', '--add-tags', type=str, nargs='*', required=False,
+                       help='Adds tag(s) to user_tags property. Space delimited list (ex. -at A B C)')
+    group.add_argument('-dt', '--delete-tags', type=str, nargs ='*', required=False,
+                       help='Removes tag(s) from the user_tags property. Space delimited list (ex. -dt A B C')
+    group.add_argument('-rt', '--replace-tags', type=str, nargs ='*', required=False,
+                       help='Replace entirety of user_tags property with space delimited list of values')
     parser.set_defaults(func=_edit_project_props)
 
 def add_args(subparsers) -> None: