diff --git a/Code/Framework/AzFramework/AzFramework/Components/NonUniformScaleComponent.cpp b/Code/Framework/AzFramework/AzFramework/Components/NonUniformScaleComponent.cpp
index 57f14ddb38..d51f3645d3 100644
--- a/Code/Framework/AzFramework/AzFramework/Components/NonUniformScaleComponent.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Components/NonUniformScaleComponent.cpp
@@ -37,29 +37,6 @@ namespace AzFramework
     void NonUniformScaleComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
     {
         incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
-
-        incompatible.push_back(AZ_CRC_CE("DebugDrawObbService"));
-        incompatible.push_back(AZ_CRC_CE("DebugDrawService"));
-        incompatible.push_back(AZ_CRC_CE("EMotionFXActorService"));
-        incompatible.push_back(AZ_CRC_CE("EMotionFXSimpleMotionService"));
-        incompatible.push_back(AZ_CRC_CE("GradientTransformService"));
-        incompatible.push_back(AZ_CRC_CE("LegacyMeshService"));
-        incompatible.push_back(AZ_CRC_CE("LookAtService"));
-        incompatible.push_back(AZ_CRC_CE("SequenceService"));
-        incompatible.push_back(AZ_CRC_CE("ClothMeshService"));
-        incompatible.push_back(AZ_CRC_CE("PhysXJointService"));
-        incompatible.push_back(AZ_CRC_CE("PhysXCharacterControllerService"));
-        incompatible.push_back(AZ_CRC_CE("PhysXRagdollService"));
-        incompatible.push_back(AZ_CRC_CE("WhiteBoxService"));
-        incompatible.push_back(AZ_CRC_CE("NavigationAreaService"));
-        incompatible.push_back(AZ_CRC_CE("GeometryService"));
-        incompatible.push_back(AZ_CRC_CE("CapsuleShapeService"));
-        incompatible.push_back(AZ_CRC_CE("CompoundShapeService"));
-        incompatible.push_back(AZ_CRC_CE("CylinderShapeService"));
-        incompatible.push_back(AZ_CRC_CE("DiskShapeService"));
-        incompatible.push_back(AZ_CRC_CE("SphereShapeService"));
-        incompatible.push_back(AZ_CRC_CE("SplineService"));
-        incompatible.push_back(AZ_CRC_CE("TubeShapeService"));
     }
 
     void NonUniformScaleComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorNonUniformScaleComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorNonUniformScaleComponent.cpp
index 989398f196..a61f042049 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorNonUniformScaleComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorNonUniformScaleComponent.cpp
@@ -63,29 +63,6 @@ namespace AzToolsFramework
         void EditorNonUniformScaleComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
         {
             incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
-
-            incompatible.push_back(AZ_CRC_CE("DebugDrawObbService"));
-            incompatible.push_back(AZ_CRC_CE("DebugDrawService"));
-            incompatible.push_back(AZ_CRC_CE("EMotionFXActorService"));
-            incompatible.push_back(AZ_CRC_CE("EMotionFXSimpleMotionService"));
-            incompatible.push_back(AZ_CRC_CE("GradientTransformService"));
-            incompatible.push_back(AZ_CRC_CE("LegacyMeshService"));
-            incompatible.push_back(AZ_CRC_CE("LookAtService"));
-            incompatible.push_back(AZ_CRC_CE("SequenceService"));
-            incompatible.push_back(AZ_CRC_CE("ClothMeshService"));
-            incompatible.push_back(AZ_CRC_CE("PhysXJointService"));
-            incompatible.push_back(AZ_CRC_CE("PhysXCharacterControllerService"));
-            incompatible.push_back(AZ_CRC_CE("PhysXRagdollService"));
-            incompatible.push_back(AZ_CRC_CE("WhiteBoxService"));
-            incompatible.push_back(AZ_CRC_CE("NavigationAreaService"));
-            incompatible.push_back(AZ_CRC_CE("GeometryService"));
-            incompatible.push_back(AZ_CRC_CE("CapsuleShapeService"));
-            incompatible.push_back(AZ_CRC_CE("CompoundShapeService"));
-            incompatible.push_back(AZ_CRC_CE("CylinderShapeService"));
-            incompatible.push_back(AZ_CRC_CE("DiskShapeService"));
-            incompatible.push_back(AZ_CRC_CE("SphereShapeService"));
-            incompatible.push_back(AZ_CRC_CE("SplineService"));
-            incompatible.push_back(AZ_CRC_CE("TubeShapeService"));
         }
 
         void EditorNonUniformScaleComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
diff --git a/Gems/DebugDraw/Code/Source/DebugDrawObbComponent.cpp b/Gems/DebugDraw/Code/Source/DebugDrawObbComponent.cpp
index df13bb56ce..72bbaba2b7 100644
--- a/Gems/DebugDraw/Code/Source/DebugDrawObbComponent.cpp
+++ b/Gems/DebugDraw/Code/Source/DebugDrawObbComponent.cpp
@@ -71,7 +71,7 @@ namespace DebugDraw
 
     void DebugDrawObbComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
     {
-        (void)incompatible;
+        incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
     }
 
     void DebugDrawObbComponent::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)
diff --git a/Gems/EMotionFX/Code/Source/Integration/Components/ActorComponent.h b/Gems/EMotionFX/Code/Source/Integration/Components/ActorComponent.h
index 416705bff4..8188da19b4 100644
--- a/Gems/EMotionFX/Code/Source/Integration/Components/ActorComponent.h
+++ b/Gems/EMotionFX/Code/Source/Integration/Components/ActorComponent.h
@@ -136,6 +136,7 @@ namespace EMotionFX
             {
                 incompatible.push_back(AZ_CRC("EMotionFXActorService", 0xd6e8f48d));
                 incompatible.push_back(AZ_CRC("MeshService", 0x71d8a455));
+                incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
             }
 
             static void GetDependentServices(AZ::ComponentDescriptor::DependencyArrayType& dependent)
diff --git a/Gems/EMotionFX/Code/Source/Integration/Components/SimpleMotionComponent.h b/Gems/EMotionFX/Code/Source/Integration/Components/SimpleMotionComponent.h
index 5f5066b9bb..6820bfe33f 100644
--- a/Gems/EMotionFX/Code/Source/Integration/Components/SimpleMotionComponent.h
+++ b/Gems/EMotionFX/Code/Source/Integration/Components/SimpleMotionComponent.h
@@ -87,6 +87,7 @@ namespace EMotionFX
             {
                 incompatible.push_back(AZ_CRC("EMotionFXAnimGraphService", 0x9ec3c819));
                 incompatible.push_back(AZ_CRC("EMotionFXSimpleMotionService", 0xea7a05d8));
+                incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
             }
             static void Reflect(AZ::ReflectContext* /*context*/);
 
diff --git a/Gems/GradientSignal/Code/Source/Components/GradientTransformComponent.cpp b/Gems/GradientSignal/Code/Source/Components/GradientTransformComponent.cpp
index 0b967a6957..f99a8a8dfb 100644
--- a/Gems/GradientSignal/Code/Source/Components/GradientTransformComponent.cpp
+++ b/Gems/GradientSignal/Code/Source/Components/GradientTransformComponent.cpp
@@ -200,6 +200,7 @@ namespace GradientSignal
     void GradientTransformComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& services)
     {
         services.push_back(AZ_CRC("GradientTransformService", 0x8c8c5ecc));
+        services.push_back(AZ_CRC_CE("NonUniformScaleService"));
     }
 
     void GradientTransformComponent::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& services)
diff --git a/Gems/LmbrCentral/Code/Source/Shape/CapsuleShapeComponent.cpp b/Gems/LmbrCentral/Code/Source/Shape/CapsuleShapeComponent.cpp
index 46eb69dbd8..2341f93dbb 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/CapsuleShapeComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/CapsuleShapeComponent.cpp
@@ -32,6 +32,7 @@ namespace LmbrCentral
     {
         incompatible.push_back(AZ_CRC("ShapeService", 0xe86aa5fe));
         incompatible.push_back(AZ_CRC("CapsuleShapeService", 0x9bc1122c));
+        incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
     }
 
     void CapsuleShapeComponent::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)
diff --git a/Gems/LmbrCentral/Code/Source/Shape/CompoundShapeComponent.h b/Gems/LmbrCentral/Code/Source/Shape/CompoundShapeComponent.h
index 25204cd4c0..1000609cf3 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/CompoundShapeComponent.h
+++ b/Gems/LmbrCentral/Code/Source/Shape/CompoundShapeComponent.h
@@ -76,6 +76,7 @@ namespace LmbrCentral
         {
             incompatible.push_back(AZ_CRC("ShapeService", 0xe86aa5fe));
             incompatible.push_back(AZ_CRC("CompoundShapeService", 0x4f7c640a));
+            incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
         }
 
         static void Reflect(AZ::ReflectContext* context);
diff --git a/Gems/LmbrCentral/Code/Source/Shape/CylinderShapeComponent.cpp b/Gems/LmbrCentral/Code/Source/Shape/CylinderShapeComponent.cpp
index 493cdef3e8..ff4ae9a9c5 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/CylinderShapeComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/CylinderShapeComponent.cpp
@@ -31,6 +31,7 @@ namespace LmbrCentral
     {
         incompatible.push_back(AZ_CRC("ShapeService", 0xe86aa5fe));
         incompatible.push_back(AZ_CRC("CylinderShapeService", 0x507c688e));
+        incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
     }
 
     void CylinderShapeComponent::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)
diff --git a/Gems/LmbrCentral/Code/Source/Shape/DiskShapeComponent.cpp b/Gems/LmbrCentral/Code/Source/Shape/DiskShapeComponent.cpp
index 2d0673f299..f4a0f778c5 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/DiskShapeComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/DiskShapeComponent.cpp
@@ -28,6 +28,7 @@ namespace LmbrCentral
     {
         incompatible.push_back(AZ_CRC("ShapeService", 0xe86aa5fe));
         incompatible.push_back(AZ_CRC("DiskShapeService", 0xd90c482b));
+        incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
     }
 
     void DiskShapeComponent::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)
diff --git a/Gems/LmbrCentral/Code/Source/Shape/EditorCapsuleShapeComponent.cpp b/Gems/LmbrCentral/Code/Source/Shape/EditorCapsuleShapeComponent.cpp
index 93fdfae29f..6c37d2f1ec 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/EditorCapsuleShapeComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/EditorCapsuleShapeComponent.cpp
@@ -78,6 +78,12 @@ namespace LmbrCentral
         EditorBaseShapeComponent::Deactivate();
     }
 
+    void EditorCapsuleShapeComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
+    {
+        EditorBaseShapeComponent::GetIncompatibleServices(incompatible);
+        incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
+    }
+
     void EditorCapsuleShapeComponent::DisplayEntityViewport(
         [[maybe_unused]] const AzFramework::ViewportInfo& viewportInfo,
         AzFramework::DebugDisplayRequests& debugDisplay)
diff --git a/Gems/LmbrCentral/Code/Source/Shape/EditorCapsuleShapeComponent.h b/Gems/LmbrCentral/Code/Source/Shape/EditorCapsuleShapeComponent.h
index 6bb34b1b9e..3accb8f29d 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/EditorCapsuleShapeComponent.h
+++ b/Gems/LmbrCentral/Code/Source/Shape/EditorCapsuleShapeComponent.h
@@ -40,6 +40,8 @@ namespace LmbrCentral
             provided.push_back(AZ_CRC("CapsuleShapeService", 0x9bc1122c));
         }
 
+        static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible);
+
         // EditorComponentBase
         void BuildGameEntity(AZ::Entity* gameEntity) override;
 
diff --git a/Gems/LmbrCentral/Code/Source/Shape/EditorCompoundShapeComponent.cpp b/Gems/LmbrCentral/Code/Source/Shape/EditorCompoundShapeComponent.cpp
index c61f54ab08..18957fae36 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/EditorCompoundShapeComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/EditorCompoundShapeComponent.cpp
@@ -59,6 +59,12 @@ namespace LmbrCentral
         }
     }
 
+    void EditorCompoundShapeComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
+    {
+        EditorBaseShapeComponent::GetIncompatibleServices(incompatible);
+        incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
+    }
+
     void EditorCompoundShapeComponent::Init()
     {
         // setup the contained runtime component so that it can manage the child entities in the editor.
diff --git a/Gems/LmbrCentral/Code/Source/Shape/EditorCompoundShapeComponent.h b/Gems/LmbrCentral/Code/Source/Shape/EditorCompoundShapeComponent.h
index 24f06ee336..c725c2ef34 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/EditorCompoundShapeComponent.h
+++ b/Gems/LmbrCentral/Code/Source/Shape/EditorCompoundShapeComponent.h
@@ -41,6 +41,8 @@ namespace LmbrCentral
             provided.push_back(AZ_CRC("CompoundShapeService", 0x4f7c640a));
         }
 
+        static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible);
+
         AZ::u32 ConfigurationChanged();
 
     private:
diff --git a/Gems/LmbrCentral/Code/Source/Shape/EditorCylinderShapeComponent.cpp b/Gems/LmbrCentral/Code/Source/Shape/EditorCylinderShapeComponent.cpp
index 89de8410f5..fe5a525fa8 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/EditorCylinderShapeComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/EditorCylinderShapeComponent.cpp
@@ -55,6 +55,12 @@ namespace LmbrCentral
         }
     }
 
+    void EditorCylinderShapeComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
+    {
+        EditorBaseShapeComponent::GetIncompatibleServices(incompatible);
+        incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
+    }
+
     void EditorCylinderShapeComponent::Init()
     {
         EditorBaseShapeComponent::Init();
diff --git a/Gems/LmbrCentral/Code/Source/Shape/EditorCylinderShapeComponent.h b/Gems/LmbrCentral/Code/Source/Shape/EditorCylinderShapeComponent.h
index a34ec6f548..3bbcf3286b 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/EditorCylinderShapeComponent.h
+++ b/Gems/LmbrCentral/Code/Source/Shape/EditorCylinderShapeComponent.h
@@ -40,6 +40,8 @@ namespace LmbrCentral
             provided.push_back(AZ_CRC("CylinderShapeService", 0x507c688e));
         }
 
+        static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible);
+
         // EditorComponentBase
         void BuildGameEntity(AZ::Entity* gameEntity) override;
 
diff --git a/Gems/LmbrCentral/Code/Source/Shape/EditorDiskShapeComponent.cpp b/Gems/LmbrCentral/Code/Source/Shape/EditorDiskShapeComponent.cpp
index 3d6181cde6..c1bfc04e7d 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/EditorDiskShapeComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/EditorDiskShapeComponent.cpp
@@ -55,6 +55,12 @@ namespace LmbrCentral
         provided.push_back(AZ_CRC("DiskShapeService", 0xd90c482b));
     }
 
+    void EditorDiskShapeComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
+    {
+        EditorBaseShapeComponent::GetIncompatibleServices(incompatible);
+        incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
+    }
+
     void EditorDiskShapeComponent::Init()
     {
         EditorBaseShapeComponent::Init();
diff --git a/Gems/LmbrCentral/Code/Source/Shape/EditorDiskShapeComponent.h b/Gems/LmbrCentral/Code/Source/Shape/EditorDiskShapeComponent.h
index 1d20f2a338..d936a4a9ec 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/EditorDiskShapeComponent.h
+++ b/Gems/LmbrCentral/Code/Source/Shape/EditorDiskShapeComponent.h
@@ -39,6 +39,7 @@ namespace LmbrCentral
 
     protected:
         static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided);
+        static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible);
 
     private:
         AZ_DISABLE_COPY_MOVE(EditorDiskShapeComponent)
diff --git a/Gems/LmbrCentral/Code/Source/Shape/EditorSphereShapeComponent.cpp b/Gems/LmbrCentral/Code/Source/Shape/EditorSphereShapeComponent.cpp
index 0d9885191d..0323ec2dfe 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/EditorSphereShapeComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/EditorSphereShapeComponent.cpp
@@ -60,6 +60,12 @@ namespace LmbrCentral
         }
     }
 
+    void EditorSphereShapeComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
+    {
+        EditorBaseShapeComponent::GetIncompatibleServices(incompatible);
+        incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
+    }
+
     void EditorSphereShapeComponent::Init()
     {
         EditorBaseShapeComponent::Init();
diff --git a/Gems/LmbrCentral/Code/Source/Shape/EditorSphereShapeComponent.h b/Gems/LmbrCentral/Code/Source/Shape/EditorSphereShapeComponent.h
index f4a80d91ed..48f1d6cb2e 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/EditorSphereShapeComponent.h
+++ b/Gems/LmbrCentral/Code/Source/Shape/EditorSphereShapeComponent.h
@@ -44,6 +44,8 @@ namespace LmbrCentral
             provided.push_back(AZ_CRC("SphereShapeService", 0x90c8dc80));
         }
 
+        static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible);
+
     private:
         AZ_DISABLE_COPY_MOVE(EditorSphereShapeComponent)
 
diff --git a/Gems/LmbrCentral/Code/Source/Shape/EditorSplineComponent.cpp b/Gems/LmbrCentral/Code/Source/Shape/EditorSplineComponent.cpp
index 144713c8ec..212ec49c93 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/EditorSplineComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/EditorSplineComponent.cpp
@@ -44,6 +44,7 @@ namespace LmbrCentral
     {
         incompatible.push_back(AZ_CRC("VariableVertexContainerService", 0x70c58740));
         incompatible.push_back(AZ_CRC("FixedVertexContainerService", 0x83f1bbf2));
+        incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
     }
 
     void EditorSplineComponent::Reflect(AZ::ReflectContext* context)
diff --git a/Gems/LmbrCentral/Code/Source/Shape/EditorTubeShapeComponent.cpp b/Gems/LmbrCentral/Code/Source/Shape/EditorTubeShapeComponent.cpp
index c8c03e2811..6ffb9e3308 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/EditorTubeShapeComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/EditorTubeShapeComponent.cpp
@@ -59,6 +59,12 @@ namespace LmbrCentral
         }
     }
 
+    void EditorTubeShapeComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
+    {
+        EditorBaseShapeComponent::GetIncompatibleServices(incompatible);
+        incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
+    }
+
     void EditorTubeShapeComponent::Init()
     {
         EditorBaseShapeComponent::Init();
diff --git a/Gems/LmbrCentral/Code/Source/Shape/EditorTubeShapeComponent.h b/Gems/LmbrCentral/Code/Source/Shape/EditorTubeShapeComponent.h
index b7b57310e5..6ffe7e9b73 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/EditorTubeShapeComponent.h
+++ b/Gems/LmbrCentral/Code/Source/Shape/EditorTubeShapeComponent.h
@@ -57,6 +57,7 @@ namespace LmbrCentral
             required.push_back(AZ_CRC("SplineService", 0x2b674d3c));
         }
 
+        static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible);
     private:
         AZ_DISABLE_COPY_MOVE(EditorTubeShapeComponent)
 
diff --git a/Gems/LmbrCentral/Code/Source/Shape/SphereShapeComponent.cpp b/Gems/LmbrCentral/Code/Source/Shape/SphereShapeComponent.cpp
index 3bddc9b695..7faa455398 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/SphereShapeComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/SphereShapeComponent.cpp
@@ -29,6 +29,7 @@ namespace LmbrCentral
     {
         incompatible.push_back(AZ_CRC("ShapeService", 0xe86aa5fe));
         incompatible.push_back(AZ_CRC("SphereShapeService", 0x90c8dc80));
+        incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
     }
 
     void SphereShapeComponent::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)
diff --git a/Gems/LmbrCentral/Code/Source/Shape/SplineComponent.h b/Gems/LmbrCentral/Code/Source/Shape/SplineComponent.h
index eaa3fde457..f4cd73574b 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/SplineComponent.h
+++ b/Gems/LmbrCentral/Code/Source/Shape/SplineComponent.h
@@ -103,6 +103,7 @@ namespace LmbrCentral
             incompatible.push_back(AZ_CRC("SplineService", 0x2b674d3c));
             incompatible.push_back(AZ_CRC("VariableVertexContainerService", 0x70c58740));
             incompatible.push_back(AZ_CRC("FixedVertexContainerService", 0x83f1bbf2));
+            incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
         }
 
         static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)
diff --git a/Gems/LmbrCentral/Code/Source/Shape/TubeShapeComponent.cpp b/Gems/LmbrCentral/Code/Source/Shape/TubeShapeComponent.cpp
index f757da2107..014612daa1 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/TubeShapeComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/TubeShapeComponent.cpp
@@ -28,6 +28,7 @@ namespace LmbrCentral
     {
         incompatible.push_back(AZ_CRC("ShapeService", 0xe86aa5fe));
         incompatible.push_back(AZ_CRC("TubeShapeService", 0x3fe791b4));
+        incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
     }
 
     void TubeShapeComponent::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)
diff --git a/Gems/Maestro/Code/Source/Components/EditorSequenceComponent.h b/Gems/Maestro/Code/Source/Components/EditorSequenceComponent.h
index 294f7b4370..f5689f3f65 100644
--- a/Gems/Maestro/Code/Source/Components/EditorSequenceComponent.h
+++ b/Gems/Maestro/Code/Source/Components/EditorSequenceComponent.h
@@ -98,6 +98,7 @@ namespace Maestro
         {
             // This guarantees that only one SequenceComponent will ever be on an entity
             incompatible.push_back(AZ_CRC("SequenceService", 0x7cbe5938));
+            incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
         }
 
         // Required Reflect function.
diff --git a/Gems/Maestro/Code/Source/Components/SequenceComponent.cpp b/Gems/Maestro/Code/Source/Components/SequenceComponent.cpp
index c1470ccf15..f1951c12a3 100644
--- a/Gems/Maestro/Code/Source/Components/SequenceComponent.cpp
+++ b/Gems/Maestro/Code/Source/Components/SequenceComponent.cpp
@@ -139,6 +139,11 @@ namespace Maestro
         }
     }
 
+    void SequenceComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
+    {
+        incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
+    }
+
     void SequenceComponent::ReflectCinematicsLib(AZ::ReflectContext* context)
     {
         // The Movie System itself
diff --git a/Gems/Maestro/Code/Source/Components/SequenceComponent.h b/Gems/Maestro/Code/Source/Components/SequenceComponent.h
index 20e7d22fe3..48cd7f25c9 100644
--- a/Gems/Maestro/Code/Source/Components/SequenceComponent.h
+++ b/Gems/Maestro/Code/Source/Components/SequenceComponent.h
@@ -97,6 +97,8 @@ namespace Maestro
             provided.push_back(AZ_CRC("SequenceService", 0x7cbe5938));
         }
 
+        static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible);
+
         // Required Reflect function.
         static void Reflect(AZ::ReflectContext* context);
     private:
diff --git a/Gems/NvCloth/Code/Source/Components/ClothComponent.cpp b/Gems/NvCloth/Code/Source/Components/ClothComponent.cpp
index ddd2d6fa36..912255c798 100644
--- a/Gems/NvCloth/Code/Source/Components/ClothComponent.cpp
+++ b/Gems/NvCloth/Code/Source/Components/ClothComponent.cpp
@@ -47,6 +47,11 @@ namespace NvCloth
         required.push_back(AZ_CRC("TransformService", 0x8ee22c50));
     }
 
+    void ClothComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
+    {
+        incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
+    }
+
     void ClothComponent::Activate()
     {
         // Cloth components do not run on dedicated servers.
diff --git a/Gems/NvCloth/Code/Source/Components/ClothComponent.h b/Gems/NvCloth/Code/Source/Components/ClothComponent.h
index 9b8458d276..bb7a645b61 100644
--- a/Gems/NvCloth/Code/Source/Components/ClothComponent.h
+++ b/Gems/NvCloth/Code/Source/Components/ClothComponent.h
@@ -38,6 +38,7 @@ namespace NvCloth
 
         static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided);
         static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required);
+        static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible);
 
         const ClothComponentMesh* GetClothComponentMesh() const { return m_clothComponentMesh.get(); }
 
diff --git a/Gems/NvCloth/Code/Source/Components/EditorClothComponent.cpp b/Gems/NvCloth/Code/Source/Components/EditorClothComponent.cpp
index 4705a9f2c2..1254a13cb2 100644
--- a/Gems/NvCloth/Code/Source/Components/EditorClothComponent.cpp
+++ b/Gems/NvCloth/Code/Source/Components/EditorClothComponent.cpp
@@ -415,6 +415,11 @@ namespace NvCloth
         required.push_back(AZ_CRC("MeshService", 0x71d8a455));
     }
 
+    void EditorClothComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
+    {
+        incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
+    }
+
     const MeshNodeList& EditorClothComponent::GetMeshNodeList() const
     {
         return m_meshNodeList;
diff --git a/Gems/NvCloth/Code/Source/Components/EditorClothComponent.h b/Gems/NvCloth/Code/Source/Components/EditorClothComponent.h
index 9727895a43..2ef3123942 100644
--- a/Gems/NvCloth/Code/Source/Components/EditorClothComponent.h
+++ b/Gems/NvCloth/Code/Source/Components/EditorClothComponent.h
@@ -39,6 +39,7 @@ namespace NvCloth
 
         static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided);
         static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required);
+        static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible);
 
         const MeshNodeList& GetMeshNodeList() const;
         const AZStd::unordered_set<AZStd::string>& GetMeshNodesWithBackstopData() const;
diff --git a/Gems/PhysX/Code/Source/EditorBallJointComponent.cpp b/Gems/PhysX/Code/Source/EditorBallJointComponent.cpp
index f3bdb83325..deb1d0d231 100644
--- a/Gems/PhysX/Code/Source/EditorBallJointComponent.cpp
+++ b/Gems/PhysX/Code/Source/EditorBallJointComponent.cpp
@@ -63,6 +63,11 @@ namespace PhysX
         required.push_back(AZ_CRC("PhysXRigidBodyService", 0x1d4c64a8));
     }
 
+    void EditorBallJointComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
+    {
+        incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
+    }
+
     void EditorBallJointComponent::Activate()
     {
         EditorJointComponent::Activate();
diff --git a/Gems/PhysX/Code/Source/EditorBallJointComponent.h b/Gems/PhysX/Code/Source/EditorBallJointComponent.h
index fbff44b38e..44f96b3fa8 100644
--- a/Gems/PhysX/Code/Source/EditorBallJointComponent.h
+++ b/Gems/PhysX/Code/Source/EditorBallJointComponent.h
@@ -33,6 +33,7 @@ namespace PhysX
 
         static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided);
         static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required);
+        static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible);
 
         // AZ::Component
         void Activate() override;
diff --git a/Gems/PhysX/Code/Source/EditorFixedJointComponent.cpp b/Gems/PhysX/Code/Source/EditorFixedJointComponent.cpp
index a2b496672c..1645d8c932 100644
--- a/Gems/PhysX/Code/Source/EditorFixedJointComponent.cpp
+++ b/Gems/PhysX/Code/Source/EditorFixedJointComponent.cpp
@@ -60,6 +60,11 @@ namespace PhysX
         required.push_back(AZ_CRC("PhysXRigidBodyService", 0x1d4c64a8));
     }
 
+    void EditorFixedJointComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
+    {
+        incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
+    }
+
     void EditorFixedJointComponent::Activate()
     {
         EditorJointComponent::Activate();
diff --git a/Gems/PhysX/Code/Source/EditorFixedJointComponent.h b/Gems/PhysX/Code/Source/EditorFixedJointComponent.h
index c66ba661be..8642f83472 100644
--- a/Gems/PhysX/Code/Source/EditorFixedJointComponent.h
+++ b/Gems/PhysX/Code/Source/EditorFixedJointComponent.h
@@ -33,6 +33,7 @@ namespace PhysX
 
         static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided);
         static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required);
+        static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible);
 
         // AZ::Component
         void Activate() override;
diff --git a/Gems/PhysX/Code/Source/EditorHingeJointComponent.cpp b/Gems/PhysX/Code/Source/EditorHingeJointComponent.cpp
index fde1ff980b..6d136e898b 100644
--- a/Gems/PhysX/Code/Source/EditorHingeJointComponent.cpp
+++ b/Gems/PhysX/Code/Source/EditorHingeJointComponent.cpp
@@ -63,6 +63,11 @@ namespace PhysX
         required.push_back(AZ_CRC("PhysXRigidBodyService", 0x1d4c64a8));
     }
 
+    void EditorHingeJointComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
+    {
+        incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
+    }
+
     void EditorHingeJointComponent::Activate()
     {
         EditorJointComponent::Activate();
diff --git a/Gems/PhysX/Code/Source/EditorHingeJointComponent.h b/Gems/PhysX/Code/Source/EditorHingeJointComponent.h
index 3b3182068b..ef555d145e 100644
--- a/Gems/PhysX/Code/Source/EditorHingeJointComponent.h
+++ b/Gems/PhysX/Code/Source/EditorHingeJointComponent.h
@@ -33,6 +33,7 @@ namespace PhysX
 
         static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided);
         static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required);
+        static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible);
 
         // AZ::Component
         void Activate() override;
diff --git a/Gems/PhysX/Code/Source/PhysXCharacters/Components/CharacterControllerComponent.h b/Gems/PhysX/Code/Source/PhysXCharacters/Components/CharacterControllerComponent.h
index 31f5051ac4..a7a1a92ad2 100644
--- a/Gems/PhysX/Code/Source/PhysXCharacters/Components/CharacterControllerComponent.h
+++ b/Gems/PhysX/Code/Source/PhysXCharacters/Components/CharacterControllerComponent.h
@@ -59,6 +59,7 @@ namespace PhysX
         static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
         {
             incompatible.push_back(AZ_CRC("PhysXCharacterControllerService", 0x428de4fa));
+            incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
         }
 
         static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)
diff --git a/Gems/PhysX/Code/Source/PhysXCharacters/Components/CharacterGameplayComponent.cpp b/Gems/PhysX/Code/Source/PhysXCharacters/Components/CharacterGameplayComponent.cpp
index 70373f8db2..d557919627 100644
--- a/Gems/PhysX/Code/Source/PhysXCharacters/Components/CharacterGameplayComponent.cpp
+++ b/Gems/PhysX/Code/Source/PhysXCharacters/Components/CharacterGameplayComponent.cpp
@@ -51,6 +51,7 @@ namespace PhysX
     void CharacterGameplayComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
     {
         incompatible.push_back(AZ_CRC("PhysXCharacterGameplayService", 0xfacd7876));
+        incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
     }
 
     void CharacterGameplayComponent::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)
diff --git a/Gems/PhysX/Code/Source/PhysXCharacters/Components/EditorCharacterControllerComponent.h b/Gems/PhysX/Code/Source/PhysXCharacters/Components/EditorCharacterControllerComponent.h
index d42c1c9537..cc2a93d0b8 100644
--- a/Gems/PhysX/Code/Source/PhysXCharacters/Components/EditorCharacterControllerComponent.h
+++ b/Gems/PhysX/Code/Source/PhysXCharacters/Components/EditorCharacterControllerComponent.h
@@ -64,6 +64,7 @@ namespace PhysX
             incompatible.push_back(AZ_CRC("PhysXCharacterControllerService", 0x428de4fa));
             incompatible.push_back(AZ_CRC("LegacyCryPhysicsService", 0xbb370351));
             incompatible.push_back(AZ_CRC("PhysXRigidBodyService", 0x1d4c64a8));
+            incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
         }
 
         static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)
diff --git a/Gems/PhysX/Code/Source/PhysXCharacters/Components/EditorCharacterGameplayComponent.cpp b/Gems/PhysX/Code/Source/PhysXCharacters/Components/EditorCharacterGameplayComponent.cpp
index 03ff0e0aea..dc67870fb2 100644
--- a/Gems/PhysX/Code/Source/PhysXCharacters/Components/EditorCharacterGameplayComponent.cpp
+++ b/Gems/PhysX/Code/Source/PhysXCharacters/Components/EditorCharacterGameplayComponent.cpp
@@ -23,6 +23,7 @@ namespace PhysX
     void EditorCharacterGameplayComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
     {
         incompatible.push_back(AZ_CRC("PhysXCharacterGameplayService", 0xfacd7876));
+        incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
     }
 
     void EditorCharacterGameplayComponent::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)
diff --git a/Gems/PhysX/Code/Source/PhysXCharacters/Components/RagdollComponent.h b/Gems/PhysX/Code/Source/PhysXCharacters/Components/RagdollComponent.h
index e7397af877..a02e9c47fb 100644
--- a/Gems/PhysX/Code/Source/PhysXCharacters/Components/RagdollComponent.h
+++ b/Gems/PhysX/Code/Source/PhysXCharacters/Components/RagdollComponent.h
@@ -49,6 +49,7 @@ namespace PhysX
         {
             incompatible.push_back(AZ_CRC("PhysXRagdollService", 0x6d889c70));
             incompatible.push_back(AZ_CRC("LegacyCryPhysicsService", 0xbb370351));
+            incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
         }
 
         static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)
diff --git a/Gems/WhiteBox/Code/Source/Components/EditorWhiteBoxColliderComponent.cpp b/Gems/WhiteBox/Code/Source/Components/EditorWhiteBoxColliderComponent.cpp
index 6e2e4be0a2..97bce7631d 100644
--- a/Gems/WhiteBox/Code/Source/Components/EditorWhiteBoxColliderComponent.cpp
+++ b/Gems/WhiteBox/Code/Source/Components/EditorWhiteBoxColliderComponent.cpp
@@ -75,6 +75,11 @@ namespace WhiteBox
         required.push_back(AZ_CRC("WhiteBoxService", 0x2f2f42b8));
     }
 
+    void EditorWhiteBoxColliderComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
+    {
+        incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
+    }
+
     void EditorWhiteBoxColliderComponent::Activate()
     {
         AzToolsFramework::Components::EditorComponentBase::Activate();
diff --git a/Gems/WhiteBox/Code/Source/Components/EditorWhiteBoxColliderComponent.h b/Gems/WhiteBox/Code/Source/Components/EditorWhiteBoxColliderComponent.h
index 5b46d0b99e..635abbb1bd 100644
--- a/Gems/WhiteBox/Code/Source/Components/EditorWhiteBoxColliderComponent.h
+++ b/Gems/WhiteBox/Code/Source/Components/EditorWhiteBoxColliderComponent.h
@@ -46,6 +46,7 @@ namespace WhiteBox
     private:
         static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided);
         static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required);
+        static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible);
 
         // AZ::Component ...
         void Activate() override;
diff --git a/Gems/WhiteBox/Code/Source/Components/WhiteBoxColliderComponent.cpp b/Gems/WhiteBox/Code/Source/Components/WhiteBoxColliderComponent.cpp
index 3179a2cd72..117b175cda 100644
--- a/Gems/WhiteBox/Code/Source/Components/WhiteBoxColliderComponent.cpp
+++ b/Gems/WhiteBox/Code/Source/Components/WhiteBoxColliderComponent.cpp
@@ -44,6 +44,11 @@ namespace WhiteBox
         required.push_back(AZ_CRC("TransformService", 0x8ee22c50));
     }
 
+    void WhiteBoxColliderComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
+    {
+        incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
+    }
+
     WhiteBoxColliderComponent::WhiteBoxColliderComponent(
         const Physics::CookedMeshShapeConfiguration& shapeConfiguration,
         const Physics::ColliderConfiguration& physicsColliderConfiguration,
diff --git a/Gems/WhiteBox/Code/Source/Components/WhiteBoxColliderComponent.h b/Gems/WhiteBox/Code/Source/Components/WhiteBoxColliderComponent.h
index 1ad773652d..0b50c834d8 100644
--- a/Gems/WhiteBox/Code/Source/Components/WhiteBoxColliderComponent.h
+++ b/Gems/WhiteBox/Code/Source/Components/WhiteBoxColliderComponent.h
@@ -41,6 +41,7 @@ namespace WhiteBox
 
     private:
         static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required);
+        static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible);
 
         // AZ::Component ...
         void Activate() override;
diff --git a/Gems/WhiteBox/Code/Source/EditorWhiteBoxComponent.cpp b/Gems/WhiteBox/Code/Source/EditorWhiteBoxComponent.cpp
index d4ab543404..e8e03556e2 100644
--- a/Gems/WhiteBox/Code/Source/EditorWhiteBoxComponent.cpp
+++ b/Gems/WhiteBox/Code/Source/EditorWhiteBoxComponent.cpp
@@ -265,6 +265,11 @@ namespace WhiteBox
         provided.push_back(AZ_CRC("WhiteBoxService", 0x2f2f42b8));
     }
 
+    void EditorWhiteBoxComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
+    {
+        incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
+    }
+
     EditorWhiteBoxComponent::EditorWhiteBoxComponent() = default;
 
     EditorWhiteBoxComponent::~EditorWhiteBoxComponent()
diff --git a/Gems/WhiteBox/Code/Source/EditorWhiteBoxComponent.h b/Gems/WhiteBox/Code/Source/EditorWhiteBoxComponent.h
index 02b50a9407..c4dd6c2b0b 100644
--- a/Gems/WhiteBox/Code/Source/EditorWhiteBoxComponent.h
+++ b/Gems/WhiteBox/Code/Source/EditorWhiteBoxComponent.h
@@ -89,6 +89,7 @@ namespace WhiteBox
     private:
         static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required);
         static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided);
+        static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible);
 
         // EditorComponentBase overrides ...
         void BuildGameEntity(AZ::Entity* gameEntity) override;