diff --git a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/CoreLights/DiskLightFeatureProcessorInterface.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/CoreLights/DiskLightFeatureProcessorInterface.h
index 98220fae15..9622b5aa40 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/CoreLights/DiskLightFeatureProcessorInterface.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/CoreLights/DiskLightFeatureProcessorInterface.h
@@ -100,7 +100,8 @@ namespace AZ
             //! Sets all of the the disk data for the provided LightHandle.
             virtual void SetDiskData(LightHandle handle, const DiskLightData& data) = 0;
 
-
+            //! Get a read only copy of a disk lights data, useful for debug rendering
+            virtual const DiskLightData& GetDiskData(LightHandle handle) const = 0;
         };
     } // namespace Render
 } // namespace AZ
diff --git a/Gems/Atom/Feature/Common/Code/Source/CoreLights/DiskLightFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/CoreLights/DiskLightFeatureProcessor.cpp
index 168a7ea00a..9c626fccd8 100644
--- a/Gems/Atom/Feature/Common/Code/Source/CoreLights/DiskLightFeatureProcessor.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/CoreLights/DiskLightFeatureProcessor.cpp
@@ -255,6 +255,13 @@ namespace AZ
             UpdateShadow(handle);
         }
 
+        const DiskLightData&  DiskLightFeatureProcessor::GetDiskData(LightHandle handle) const
+        {
+            AZ_Assert(handle.IsValid(), "Invalid LightHandle passed to DiskLightFeatureProcessor::GetDiskData().");
+
+            return m_diskLightData.GetData(handle.GetIndex());
+        }
+
         const Data::Instance<RPI::Buffer> DiskLightFeatureProcessor::GetLightBuffer()const
         {
             return m_lightBufferHandler.GetBuffer();
diff --git a/Gems/Atom/Feature/Common/Code/Source/CoreLights/DiskLightFeatureProcessor.h b/Gems/Atom/Feature/Common/Code/Source/CoreLights/DiskLightFeatureProcessor.h
index bafddacc65..d742b1fbc0 100644
--- a/Gems/Atom/Feature/Common/Code/Source/CoreLights/DiskLightFeatureProcessor.h
+++ b/Gems/Atom/Feature/Common/Code/Source/CoreLights/DiskLightFeatureProcessor.h
@@ -58,6 +58,7 @@ namespace AZ
             void SetEsmExponent(LightHandle handle, float esmExponent) override;
 
             void SetDiskData(LightHandle handle, const DiskLightData& data) override;
+            const DiskLightData& GetDiskData(LightHandle handle) const override;
 
             const Data::Instance<RPI::Buffer> GetLightBuffer()const;
             uint32_t GetLightCount()const;
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 29b127407e..b3e898c4dd 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
@@ -184,8 +184,8 @@ namespace AZ
             virtual void DrawDisk(const AZ::Vector3& center, const AZ::Vector3& direction, float radius, const AZ::Color& color, DrawStyle style = DrawStyle::Shaded, DepthTest depthTest = DepthTest::On, DepthWrite depthWrite = DepthWrite::On, FaceCullMode faceCull = FaceCullMode::Back, int32_t viewProjOverrideIndex = -1) = 0;
 
             //! Draw a cone.
-            //! @param center        The center of the base circle.
-            //! @param direction     The direction vector. The tip of the cone will point along this vector.
+            //! @param center        The center of the cone base.
+            //! @param direction     The direction vector. This is the vector from the center of the base to the point at the tip.
             //! @param radius        The radius.
             //! @param height        The height of the cone (the distance from the base center to the tip).
             //! @param color         The color to draw the cone.