diff --git a/.github/workflows/Build Thunder on Windows.yml b/.github/workflows/Build Thunder on Windows.yml
index 070a31998a..894efe04c4 100644
--- a/.github/workflows/Build Thunder on Windows.yml	
+++ b/.github/workflows/Build Thunder on Windows.yml	
@@ -22,7 +22,7 @@ env:
   bridge: Thunder\Source\Thunder\bridge.vcxproj
   comProcess: Thunder\Source\ThunderPlugin\comprocess.vcxproj
   solution: Thunder.sln
-  warningReporting: Thunder\Source\extensions\warningreporting\warningreporting.vcxproj
+  warningReporting: Thunder\Source\addons\warningreporting\warningreporting.vcxproj
 
 jobs:
   Thunder:
diff --git a/NOTICE b/NOTICE
index 6751f24679..5872d13dea 100644
--- a/NOTICE
+++ b/NOTICE
@@ -7,7 +7,7 @@ listed below. Your use of this material within the component is also subject to
 conditions of these licenses. The LICENSE file contains the text of all the licenses which apply
 within this component.
 
-Files under the implementations directory are:
+Files under the implementations directory (and other changes as indicated) are:
 Copyright Liberty Global B.V.
 Licensed under the Apache License, Version 2.0
 unless otherwise noted.
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index 3141e7f7a8..8a4fc3ade8 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -78,7 +78,7 @@ if(MESSAGING)
     add_subdirectory(messaging)
 endif()
 
-add_subdirectory(extensions)
+add_subdirectory(addons)
 
 if(COM)
     add_subdirectory(com)
diff --git a/Source/Thunder/PluginServer.cpp b/Source/Thunder/PluginServer.cpp
index fba963eaf1..b87ca88d17 100644
--- a/Source/Thunder/PluginServer.cpp
+++ b/Source/Thunder/PluginServer.cpp
@@ -29,7 +29,7 @@
 #endif
 
 #ifdef HIBERNATE_SUPPORT_ENABLED
-#include "../extensions/hibernate/hibernate.h"
+#include "../addons/hibernate/hibernate.h"
 #endif
 
 namespace Thunder {
diff --git a/Source/Thunder/bridge.vcxproj b/Source/Thunder/bridge.vcxproj
index 10f4936a9f..f9a01c0b4d 100755
--- a/Source/Thunder/bridge.vcxproj
+++ b/Source/Thunder/bridge.vcxproj
@@ -122,7 +122,7 @@
       <PreprocessorDefinitions>APPLICATION_NAME=Thunder;__CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;_WINDOWS;THREADPOOL_COUNT=4;HOSTING_COMPROCESS=comprocess.exe;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>$(FrameworkPath)plugins;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extensions</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(FrameworkPath)plugins;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)addons</AdditionalIncludeDirectories>
       <UseStandardPreprocessor>true</UseStandardPreprocessor>
     </ClCompile>
     <Link>
@@ -146,7 +146,7 @@
       <PreprocessorDefinitions>APPLICATION_NAME=Thunder;__CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;_WINDOWS;THREADPOOL_COUNT=4;HOSTING_COMPROCESS=comprocess.exe;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>$(FrameworkPath)plugins;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extensions</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(FrameworkPath)plugins;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)addons</AdditionalIncludeDirectories>
       <UseStandardPreprocessor>true</UseStandardPreprocessor>
     </ClCompile>
     <Link>
@@ -168,7 +168,7 @@
       <PreprocessorDefinitions>APPLICATION_NAME=Thunder;__CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;_WINDOWS;THREADPOOL_COUNT=4;HOSTING_COMPROCESS=comprocess.exe;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>$(FrameworkPath)plugins;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extensions</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(FrameworkPath)plugins;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)addons</AdditionalIncludeDirectories>
       <UseStandardPreprocessor>true</UseStandardPreprocessor>
     </ClCompile>
     <Link>
@@ -192,7 +192,7 @@
       <PreprocessorDefinitions>APPLICATION_NAME=Thunder;__CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;_WINDOWS;THREADPOOL_COUNT=4;HOSTING_COMPROCESS=comprocess.exe;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>$(FrameworkPath)plugins;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extensions</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(FrameworkPath)plugins;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)addons</AdditionalIncludeDirectories>
       <UseStandardPreprocessor>true</UseStandardPreprocessor>
     </ClCompile>
     <Link>
diff --git a/Source/ThunderPlugin/comprocess.vcxproj b/Source/ThunderPlugin/comprocess.vcxproj
index 6f902cfb59..cf92520bbb 100755
--- a/Source/ThunderPlugin/comprocess.vcxproj
+++ b/Source/ThunderPlugin/comprocess.vcxproj
@@ -110,7 +110,7 @@
       <PreprocessorDefinitions>__CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;_WINDOWS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extensions</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)addons</AdditionalIncludeDirectories>
       <UseStandardPreprocessor>true</UseStandardPreprocessor>
     </ClCompile>
     <Link>
@@ -131,7 +131,7 @@
       <PreprocessorDefinitions>__CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;_WINDOWS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extensions</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)addons</AdditionalIncludeDirectories>
       <UseStandardPreprocessor>true</UseStandardPreprocessor>
     </ClCompile>
     <Link>
@@ -150,7 +150,7 @@
       <PreprocessorDefinitions>__CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;_WINDOWS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extensions</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)addons</AdditionalIncludeDirectories>
       <UseStandardPreprocessor>true</UseStandardPreprocessor>
     </ClCompile>
     <Link>
@@ -171,7 +171,7 @@
       <PreprocessorDefinitions>__CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;_WINDOWS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extensions</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)addons</AdditionalIncludeDirectories>
       <UseStandardPreprocessor>true</UseStandardPreprocessor>
     </ClCompile>
     <Link>
diff --git a/Source/extensions/CMakeLists.txt b/Source/addons/CMakeLists.txt
similarity index 100%
rename from Source/extensions/CMakeLists.txt
rename to Source/addons/CMakeLists.txt
diff --git a/Source/extensions/hibernate/CMakeLists.txt b/Source/addons/hibernate/CMakeLists.txt
similarity index 100%
rename from Source/extensions/hibernate/CMakeLists.txt
rename to Source/addons/hibernate/CMakeLists.txt
diff --git a/Source/extensions/hibernate/checkpointlib/CheckpointLib.c b/Source/addons/hibernate/checkpointlib/CheckpointLib.c
similarity index 100%
rename from Source/extensions/hibernate/checkpointlib/CheckpointLib.c
rename to Source/addons/hibernate/checkpointlib/CheckpointLib.c
diff --git a/Source/extensions/hibernate/checkpointserver/CheckpointServer.c b/Source/addons/hibernate/checkpointserver/CheckpointServer.c
similarity index 100%
rename from Source/extensions/hibernate/checkpointserver/CheckpointServer.c
rename to Source/addons/hibernate/checkpointserver/CheckpointServer.c
diff --git a/Source/extensions/hibernate/common/Log.h b/Source/addons/hibernate/common/Log.h
similarity index 100%
rename from Source/extensions/hibernate/common/Log.h
rename to Source/addons/hibernate/common/Log.h
diff --git a/Source/extensions/hibernate/hibernate.h b/Source/addons/hibernate/hibernate.h
similarity index 100%
rename from Source/extensions/hibernate/hibernate.h
rename to Source/addons/hibernate/hibernate.h
diff --git a/Source/extensions/localtracer/CMakeLists.txt b/Source/addons/localtracer/CMakeLists.txt
similarity index 100%
rename from Source/extensions/localtracer/CMakeLists.txt
rename to Source/addons/localtracer/CMakeLists.txt
diff --git a/Source/extensions/localtracer/example/CMakeLists.txt b/Source/addons/localtracer/example/CMakeLists.txt
similarity index 100%
rename from Source/extensions/localtracer/example/CMakeLists.txt
rename to Source/addons/localtracer/example/CMakeLists.txt
diff --git a/Source/extensions/localtracer/example/main.cpp b/Source/addons/localtracer/example/main.cpp
similarity index 100%
rename from Source/extensions/localtracer/example/main.cpp
rename to Source/addons/localtracer/example/main.cpp
diff --git a/Source/extensions/localtracer/include/localtracer/localtracer.h b/Source/addons/localtracer/include/localtracer/localtracer.h
similarity index 100%
rename from Source/extensions/localtracer/include/localtracer/localtracer.h
rename to Source/addons/localtracer/include/localtracer/localtracer.h
diff --git a/Source/extensions/privilegedrequest/CMakeLists.txt b/Source/addons/privilegedrequest/CMakeLists.txt
similarity index 100%
rename from Source/extensions/privilegedrequest/CMakeLists.txt
rename to Source/addons/privilegedrequest/CMakeLists.txt
diff --git a/Source/extensions/privilegedrequest/example/CMakeLists.txt b/Source/addons/privilegedrequest/example/CMakeLists.txt
similarity index 100%
rename from Source/extensions/privilegedrequest/example/CMakeLists.txt
rename to Source/addons/privilegedrequest/example/CMakeLists.txt
diff --git a/Source/extensions/privilegedrequest/example/main.cpp b/Source/addons/privilegedrequest/example/main.cpp
similarity index 100%
rename from Source/extensions/privilegedrequest/example/main.cpp
rename to Source/addons/privilegedrequest/example/main.cpp
diff --git a/Source/extensions/privilegedrequest/include/privilegedrequest/PrivilegedRequest.h b/Source/addons/privilegedrequest/include/privilegedrequest/PrivilegedRequest.h
similarity index 100%
rename from Source/extensions/privilegedrequest/include/privilegedrequest/PrivilegedRequest.h
rename to Source/addons/privilegedrequest/include/privilegedrequest/PrivilegedRequest.h
diff --git a/Source/extensions/processcontainers/CMakeLists.txt b/Source/addons/processcontainers/CMakeLists.txt
similarity index 100%
rename from Source/extensions/processcontainers/CMakeLists.txt
rename to Source/addons/processcontainers/CMakeLists.txt
diff --git a/Source/extensions/processcontainers/ContainerAdministrator.cpp b/Source/addons/processcontainers/ContainerAdministrator.cpp
similarity index 100%
rename from Source/extensions/processcontainers/ContainerAdministrator.cpp
rename to Source/addons/processcontainers/ContainerAdministrator.cpp
diff --git a/Source/extensions/processcontainers/ContainerAdministrator.h b/Source/addons/processcontainers/ContainerAdministrator.h
similarity index 100%
rename from Source/extensions/processcontainers/ContainerAdministrator.h
rename to Source/addons/processcontainers/ContainerAdministrator.h
diff --git a/Source/extensions/processcontainers/ContainerProducer.h b/Source/addons/processcontainers/ContainerProducer.h
similarity index 100%
rename from Source/extensions/processcontainers/ContainerProducer.h
rename to Source/addons/processcontainers/ContainerProducer.h
diff --git a/Source/extensions/processcontainers/IProcessContainers.h b/Source/addons/processcontainers/IProcessContainers.h
similarity index 100%
rename from Source/extensions/processcontainers/IProcessContainers.h
rename to Source/addons/processcontainers/IProcessContainers.h
diff --git a/Source/extensions/processcontainers/Messaging.h b/Source/addons/processcontainers/Messaging.h
similarity index 100%
rename from Source/extensions/processcontainers/Messaging.h
rename to Source/addons/processcontainers/Messaging.h
diff --git a/Source/extensions/processcontainers/Module.cpp b/Source/addons/processcontainers/Module.cpp
similarity index 100%
rename from Source/extensions/processcontainers/Module.cpp
rename to Source/addons/processcontainers/Module.cpp
diff --git a/Source/extensions/processcontainers/Module.h b/Source/addons/processcontainers/Module.h
similarity index 100%
rename from Source/extensions/processcontainers/Module.h
rename to Source/addons/processcontainers/Module.h
diff --git a/Source/extensions/processcontainers/common/BaseContainerIterator.h b/Source/addons/processcontainers/common/BaseContainerIterator.h
similarity index 100%
rename from Source/extensions/processcontainers/common/BaseContainerIterator.h
rename to Source/addons/processcontainers/common/BaseContainerIterator.h
diff --git a/Source/extensions/processcontainers/common/BaseRefCount.h b/Source/addons/processcontainers/common/BaseRefCount.h
similarity index 100%
rename from Source/extensions/processcontainers/common/BaseRefCount.h
rename to Source/addons/processcontainers/common/BaseRefCount.h
diff --git a/Source/extensions/processcontainers/common/CGroupContainerInfo.h b/Source/addons/processcontainers/common/CGroupContainerInfo.h
similarity index 100%
rename from Source/extensions/processcontainers/common/CGroupContainerInfo.h
rename to Source/addons/processcontainers/common/CGroupContainerInfo.h
diff --git a/Source/extensions/processcontainers/implementations/AWCImplementation/AWC.cpp b/Source/addons/processcontainers/implementations/AWCImplementation/AWC.cpp
similarity index 100%
rename from Source/extensions/processcontainers/implementations/AWCImplementation/AWC.cpp
rename to Source/addons/processcontainers/implementations/AWCImplementation/AWC.cpp
diff --git a/Source/extensions/processcontainers/implementations/AWCImplementation/AWC.h b/Source/addons/processcontainers/implementations/AWCImplementation/AWC.h
similarity index 100%
rename from Source/extensions/processcontainers/implementations/AWCImplementation/AWC.h
rename to Source/addons/processcontainers/implementations/AWCImplementation/AWC.h
diff --git a/Source/extensions/processcontainers/implementations/AWCImplementation/AWCContainerAdministrator.cpp b/Source/addons/processcontainers/implementations/AWCImplementation/AWCContainerAdministrator.cpp
similarity index 100%
rename from Source/extensions/processcontainers/implementations/AWCImplementation/AWCContainerAdministrator.cpp
rename to Source/addons/processcontainers/implementations/AWCImplementation/AWCContainerAdministrator.cpp
diff --git a/Source/extensions/processcontainers/implementations/AWCImplementation/AWCContainerAdministrator.h b/Source/addons/processcontainers/implementations/AWCImplementation/AWCContainerAdministrator.h
similarity index 100%
rename from Source/extensions/processcontainers/implementations/AWCImplementation/AWCContainerAdministrator.h
rename to Source/addons/processcontainers/implementations/AWCImplementation/AWCContainerAdministrator.h
diff --git a/Source/extensions/processcontainers/implementations/AWCImplementation/AWCContainerBase.cpp b/Source/addons/processcontainers/implementations/AWCImplementation/AWCContainerBase.cpp
similarity index 100%
rename from Source/extensions/processcontainers/implementations/AWCImplementation/AWCContainerBase.cpp
rename to Source/addons/processcontainers/implementations/AWCImplementation/AWCContainerBase.cpp
diff --git a/Source/extensions/processcontainers/implementations/AWCImplementation/AWCContainerBase.h b/Source/addons/processcontainers/implementations/AWCImplementation/AWCContainerBase.h
similarity index 100%
rename from Source/extensions/processcontainers/implementations/AWCImplementation/AWCContainerBase.h
rename to Source/addons/processcontainers/implementations/AWCImplementation/AWCContainerBase.h
diff --git a/Source/extensions/processcontainers/implementations/AWCImplementation/AWCImplementation.cpp b/Source/addons/processcontainers/implementations/AWCImplementation/AWCImplementation.cpp
similarity index 100%
rename from Source/extensions/processcontainers/implementations/AWCImplementation/AWCImplementation.cpp
rename to Source/addons/processcontainers/implementations/AWCImplementation/AWCImplementation.cpp
diff --git a/Source/extensions/processcontainers/implementations/AWCImplementation/AWCImplementation.h b/Source/addons/processcontainers/implementations/AWCImplementation/AWCImplementation.h
similarity index 100%
rename from Source/extensions/processcontainers/implementations/AWCImplementation/AWCImplementation.h
rename to Source/addons/processcontainers/implementations/AWCImplementation/AWCImplementation.h
diff --git a/Source/extensions/processcontainers/implementations/AWCImplementation/AWCProxyContainer.cpp b/Source/addons/processcontainers/implementations/AWCImplementation/AWCProxyContainer.cpp
similarity index 100%
rename from Source/extensions/processcontainers/implementations/AWCImplementation/AWCProxyContainer.cpp
rename to Source/addons/processcontainers/implementations/AWCImplementation/AWCProxyContainer.cpp
diff --git a/Source/extensions/processcontainers/implementations/AWCImplementation/AWCProxyContainer.h b/Source/addons/processcontainers/implementations/AWCImplementation/AWCProxyContainer.h
similarity index 100%
rename from Source/extensions/processcontainers/implementations/AWCImplementation/AWCProxyContainer.h
rename to Source/addons/processcontainers/implementations/AWCImplementation/AWCProxyContainer.h
diff --git a/Source/extensions/processcontainers/implementations/AWCImplementation/CMakeLists.txt b/Source/addons/processcontainers/implementations/AWCImplementation/CMakeLists.txt
similarity index 100%
rename from Source/extensions/processcontainers/implementations/AWCImplementation/CMakeLists.txt
rename to Source/addons/processcontainers/implementations/AWCImplementation/CMakeLists.txt
diff --git a/Source/extensions/processcontainers/implementations/AWCImplementation/dbus/Client.cpp b/Source/addons/processcontainers/implementations/AWCImplementation/dbus/Client.cpp
similarity index 100%
rename from Source/extensions/processcontainers/implementations/AWCImplementation/dbus/Client.cpp
rename to Source/addons/processcontainers/implementations/AWCImplementation/dbus/Client.cpp
diff --git a/Source/extensions/processcontainers/implementations/AWCImplementation/dbus/Client.h b/Source/addons/processcontainers/implementations/AWCImplementation/dbus/Client.h
similarity index 100%
rename from Source/extensions/processcontainers/implementations/AWCImplementation/dbus/Client.h
rename to Source/addons/processcontainers/implementations/AWCImplementation/dbus/Client.h
diff --git a/Source/extensions/processcontainers/implementations/AWCImplementation/dbus/api.xml b/Source/addons/processcontainers/implementations/AWCImplementation/dbus/api.xml
similarity index 100%
rename from Source/extensions/processcontainers/implementations/AWCImplementation/dbus/api.xml
rename to Source/addons/processcontainers/implementations/AWCImplementation/dbus/api.xml
diff --git a/Source/extensions/processcontainers/implementations/CRunImplementation/CMakeLists.txt b/Source/addons/processcontainers/implementations/CRunImplementation/CMakeLists.txt
similarity index 100%
rename from Source/extensions/processcontainers/implementations/CRunImplementation/CMakeLists.txt
rename to Source/addons/processcontainers/implementations/CRunImplementation/CMakeLists.txt
diff --git a/Source/extensions/processcontainers/implementations/CRunImplementation/CRunImplementation.cpp b/Source/addons/processcontainers/implementations/CRunImplementation/CRunImplementation.cpp
similarity index 100%
rename from Source/extensions/processcontainers/implementations/CRunImplementation/CRunImplementation.cpp
rename to Source/addons/processcontainers/implementations/CRunImplementation/CRunImplementation.cpp
diff --git a/Source/extensions/processcontainers/implementations/CRunImplementation/CRunImplementation.h b/Source/addons/processcontainers/implementations/CRunImplementation/CRunImplementation.h
similarity index 100%
rename from Source/extensions/processcontainers/implementations/CRunImplementation/CRunImplementation.h
rename to Source/addons/processcontainers/implementations/CRunImplementation/CRunImplementation.h
diff --git a/Source/extensions/processcontainers/implementations/DobbyImplementation/CMakeLists.txt b/Source/addons/processcontainers/implementations/DobbyImplementation/CMakeLists.txt
similarity index 100%
rename from Source/extensions/processcontainers/implementations/DobbyImplementation/CMakeLists.txt
rename to Source/addons/processcontainers/implementations/DobbyImplementation/CMakeLists.txt
diff --git a/Source/extensions/processcontainers/implementations/DobbyImplementation/DobbyImplementation.cpp b/Source/addons/processcontainers/implementations/DobbyImplementation/DobbyImplementation.cpp
similarity index 100%
rename from Source/extensions/processcontainers/implementations/DobbyImplementation/DobbyImplementation.cpp
rename to Source/addons/processcontainers/implementations/DobbyImplementation/DobbyImplementation.cpp
diff --git a/Source/extensions/processcontainers/implementations/DobbyImplementation/DobbyImplementation.h b/Source/addons/processcontainers/implementations/DobbyImplementation/DobbyImplementation.h
similarity index 100%
rename from Source/extensions/processcontainers/implementations/DobbyImplementation/DobbyImplementation.h
rename to Source/addons/processcontainers/implementations/DobbyImplementation/DobbyImplementation.h
diff --git a/Source/extensions/processcontainers/implementations/LXCImplementation/CMakeLists.txt b/Source/addons/processcontainers/implementations/LXCImplementation/CMakeLists.txt
similarity index 100%
rename from Source/extensions/processcontainers/implementations/LXCImplementation/CMakeLists.txt
rename to Source/addons/processcontainers/implementations/LXCImplementation/CMakeLists.txt
diff --git a/Source/extensions/processcontainers/implementations/LXCImplementation/LXCImplementation.cpp b/Source/addons/processcontainers/implementations/LXCImplementation/LXCImplementation.cpp
similarity index 100%
rename from Source/extensions/processcontainers/implementations/LXCImplementation/LXCImplementation.cpp
rename to Source/addons/processcontainers/implementations/LXCImplementation/LXCImplementation.cpp
diff --git a/Source/extensions/processcontainers/implementations/LXCImplementation/LXCImplementation.h b/Source/addons/processcontainers/implementations/LXCImplementation/LXCImplementation.h
similarity index 100%
rename from Source/extensions/processcontainers/implementations/LXCImplementation/LXCImplementation.h
rename to Source/addons/processcontainers/implementations/LXCImplementation/LXCImplementation.h
diff --git a/Source/extensions/processcontainers/implementations/RunCImplementation/CMakeLists.txt b/Source/addons/processcontainers/implementations/RunCImplementation/CMakeLists.txt
similarity index 100%
rename from Source/extensions/processcontainers/implementations/RunCImplementation/CMakeLists.txt
rename to Source/addons/processcontainers/implementations/RunCImplementation/CMakeLists.txt
diff --git a/Source/extensions/processcontainers/implementations/RunCImplementation/RunCImplementation.cpp b/Source/addons/processcontainers/implementations/RunCImplementation/RunCImplementation.cpp
similarity index 100%
rename from Source/extensions/processcontainers/implementations/RunCImplementation/RunCImplementation.cpp
rename to Source/addons/processcontainers/implementations/RunCImplementation/RunCImplementation.cpp
diff --git a/Source/extensions/processcontainers/implementations/RunCImplementation/RunCImplementation.h b/Source/addons/processcontainers/implementations/RunCImplementation/RunCImplementation.h
similarity index 100%
rename from Source/extensions/processcontainers/implementations/RunCImplementation/RunCImplementation.h
rename to Source/addons/processcontainers/implementations/RunCImplementation/RunCImplementation.h
diff --git a/Source/extensions/processcontainers/processcontainers.h b/Source/addons/processcontainers/processcontainers.h
similarity index 100%
rename from Source/extensions/processcontainers/processcontainers.h
rename to Source/addons/processcontainers/processcontainers.h
diff --git a/Source/extensions/warningreporting/CMakeLists.txt b/Source/addons/warningreporting/CMakeLists.txt
similarity index 100%
rename from Source/extensions/warningreporting/CMakeLists.txt
rename to Source/addons/warningreporting/CMakeLists.txt
diff --git a/Source/extensions/warningreporting/IWarningReportingMedia.h b/Source/addons/warningreporting/IWarningReportingMedia.h
similarity index 100%
rename from Source/extensions/warningreporting/IWarningReportingMedia.h
rename to Source/addons/warningreporting/IWarningReportingMedia.h
diff --git a/Source/extensions/warningreporting/Module.cpp b/Source/addons/warningreporting/Module.cpp
similarity index 100%
rename from Source/extensions/warningreporting/Module.cpp
rename to Source/addons/warningreporting/Module.cpp
diff --git a/Source/extensions/warningreporting/Module.h b/Source/addons/warningreporting/Module.h
similarity index 100%
rename from Source/extensions/warningreporting/Module.h
rename to Source/addons/warningreporting/Module.h
diff --git a/Source/extensions/warningreporting/WarningReportingUnit.cpp b/Source/addons/warningreporting/WarningReportingUnit.cpp
similarity index 100%
rename from Source/extensions/warningreporting/WarningReportingUnit.cpp
rename to Source/addons/warningreporting/WarningReportingUnit.cpp
diff --git a/Source/extensions/warningreporting/WarningReportingUnit.h b/Source/addons/warningreporting/WarningReportingUnit.h
similarity index 100%
rename from Source/extensions/warningreporting/WarningReportingUnit.h
rename to Source/addons/warningreporting/WarningReportingUnit.h
diff --git a/Source/extensions/warningreporting/warningreporting.h b/Source/addons/warningreporting/warningreporting.h
similarity index 100%
rename from Source/extensions/warningreporting/warningreporting.h
rename to Source/addons/warningreporting/warningreporting.h
diff --git a/Source/extensions/warningreporting/warningreporting.vcxproj b/Source/addons/warningreporting/warningreporting.vcxproj
similarity index 98%
rename from Source/extensions/warningreporting/warningreporting.vcxproj
rename to Source/addons/warningreporting/warningreporting.vcxproj
index 2bfd1a4f91..96554246ee 100644
--- a/Source/extensions/warningreporting/warningreporting.vcxproj
+++ b/Source/addons/warningreporting/warningreporting.vcxproj
@@ -186,4 +186,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Source/extensions/warningreporting/warningreporting.vcxproj.filters b/Source/addons/warningreporting/warningreporting.vcxproj.filters
similarity index 100%
rename from Source/extensions/warningreporting/warningreporting.vcxproj.filters
rename to Source/addons/warningreporting/warningreporting.vcxproj.filters
diff --git a/Source/com/com.vcxproj b/Source/com/com.vcxproj
index 5def64775d..a99e18c441 100644
--- a/Source/com/com.vcxproj
+++ b/Source/com/com.vcxproj
@@ -126,7 +126,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>__CORE_MESSAGING__;COM_EXPORTS;_CRT_SECURE_NO_WARNINGS;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>.;$(FrameworkPath);$(WindowsPath);$(FrameworkPath)extensions</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;$(FrameworkPath);$(WindowsPath);$(FrameworkPath)addons</AdditionalIncludeDirectories>
       <UseStandardPreprocessor>true</UseStandardPreprocessor>
     </ClCompile>
     <Link>
@@ -149,7 +149,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>__CORE_MESSAGING__;COM_EXPORTS;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>.;$(FrameworkPath);$(WindowsPath);$(FrameworkPath)extensions</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;$(FrameworkPath);$(WindowsPath);$(FrameworkPath)addons</AdditionalIncludeDirectories>
       <UseStandardPreprocessor>true</UseStandardPreprocessor>
     </ClCompile>
     <Link>
@@ -170,7 +170,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>__CORE_MESSAGING__;COM_EXPORTS;_CRT_SECURE_NO_WARNINGS;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>.;$(FrameworkPath);$(WindowsPath);$(FrameworkPath)extensions</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;$(FrameworkPath);$(WindowsPath);$(FrameworkPath)addons</AdditionalIncludeDirectories>
       <UseStandardPreprocessor>true</UseStandardPreprocessor>
     </ClCompile>
     <Link>
@@ -193,7 +193,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>__CORE_MESSAGING__;COM_EXPORTS;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>.;$(FrameworkPath);$(WindowsPath);$(FrameworkPath)extensions</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;$(FrameworkPath);$(WindowsPath);$(FrameworkPath)addons</AdditionalIncludeDirectories>
       <UseStandardPreprocessor>true</UseStandardPreprocessor>
     </ClCompile>
     <Link>
diff --git a/Source/common/common.vcxproj b/Source/common/common.vcxproj
index fc332cf25a..7b371047a4 100644
--- a/Source/common/common.vcxproj
+++ b/Source/common/common.vcxproj
@@ -130,7 +130,7 @@
 			<SDLCheck>true</SDLCheck>
 			<PreprocessorDefinitions>__CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;NDEBUG;COMMON_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<ConformanceMode>true</ConformanceMode>
-			<AdditionalIncludeDirectories>.;..\plugins;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extensions</AdditionalIncludeDirectories>
+			<AdditionalIncludeDirectories>.;..\plugins;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)addons</AdditionalIncludeDirectories>
 			<UseStandardPreprocessor>true</UseStandardPreprocessor>
 		</ClCompile>
 		<Link>
@@ -151,7 +151,7 @@
 			<SDLCheck>true</SDLCheck>
 			<PreprocessorDefinitions>__CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;COMMON_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<ConformanceMode>true</ConformanceMode>
-			<AdditionalIncludeDirectories>.;..\plugins;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extensions</AdditionalIncludeDirectories>
+			<AdditionalIncludeDirectories>.;..\plugins;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)addons</AdditionalIncludeDirectories>
 			<UseStandardPreprocessor>true</UseStandardPreprocessor>
 		</ClCompile>
 		<Link>
@@ -170,7 +170,7 @@
 			<SDLCheck>true</SDLCheck>
 			<PreprocessorDefinitions>__CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;_DEBUG;COMMON_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<ConformanceMode>true</ConformanceMode>
-			<AdditionalIncludeDirectories>.;..\plugins;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extensions</AdditionalIncludeDirectories>
+			<AdditionalIncludeDirectories>.;..\plugins;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)addons</AdditionalIncludeDirectories>
 			<UseStandardPreprocessor>true</UseStandardPreprocessor>
 		</ClCompile>
 		<Link>
@@ -191,7 +191,7 @@
 			<SDLCheck>true</SDLCheck>
 			<PreprocessorDefinitions>__CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;COMMON_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<ConformanceMode>true</ConformanceMode>
-			<AdditionalIncludeDirectories>.;..\plugins;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extensions</AdditionalIncludeDirectories>
+			<AdditionalIncludeDirectories>.;..\plugins;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)addons</AdditionalIncludeDirectories>
 			<UseStandardPreprocessor>true</UseStandardPreprocessor>
 		</ClCompile>
 		<Link>
diff --git a/Source/plugins/plugins.vcxproj b/Source/plugins/plugins.vcxproj
index 55a74c5044..b9e7d5ced0 100755
--- a/Source/plugins/plugins.vcxproj
+++ b/Source/plugins/plugins.vcxproj
@@ -157,7 +157,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>__CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;NDEBUG;PLUGINS_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>.;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extensions</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)addons</AdditionalIncludeDirectories>
       <UseStandardPreprocessor>true</UseStandardPreprocessor>
     </ClCompile>
     <Link>
@@ -198,7 +198,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>__CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;PLUGINS_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>.;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extensions</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)addons</AdditionalIncludeDirectories>
       <UseStandardPreprocessor>true</UseStandardPreprocessor>
     </ClCompile>
     <Link>
@@ -237,7 +237,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>__CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;_DEBUG;PLUGINS_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>.;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extensions</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)addons</AdditionalIncludeDirectories>
       <UseStandardPreprocessor>true</UseStandardPreprocessor>
     </ClCompile>
     <Link>
@@ -278,7 +278,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>__CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;PLUGINS_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>.;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extensions</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)addons</AdditionalIncludeDirectories>
       <UseStandardPreprocessor>true</UseStandardPreprocessor>
     </ClCompile>
     <Link>
diff --git a/Source/plugins/proxystubs.vcxproj b/Source/plugins/proxystubs.vcxproj
index 73347c856c..e0c79b197b 100644
--- a/Source/plugins/proxystubs.vcxproj
+++ b/Source/plugins/proxystubs.vcxproj
@@ -116,7 +116,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>__CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;NDEBUG;PLUGINS_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>.;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extensions</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)addons</AdditionalIncludeDirectories>
       <UseStandardPreprocessor>true</UseStandardPreprocessor>
       <AdditionalOptions>/wd4996 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
@@ -142,7 +142,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>__CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;PLUGINS_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>.;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extensions</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)addons</AdditionalIncludeDirectories>
       <UseStandardPreprocessor>true</UseStandardPreprocessor>
       <AdditionalOptions>/wd4996 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
@@ -166,7 +166,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>__CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;_DEBUG;PLUGINS_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>.;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extensions</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)addons</AdditionalIncludeDirectories>
       <UseStandardPreprocessor>true</UseStandardPreprocessor>
       <AdditionalOptions>/wd4996 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
@@ -192,7 +192,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>__CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;PLUGINS_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>.;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extensions</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)addons</AdditionalIncludeDirectories>
       <UseStandardPreprocessor>true</UseStandardPreprocessor>
       <AdditionalOptions>/wd4996 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
diff --git a/Tests/unit/core/CMakeLists.txt b/Tests/unit/core/CMakeLists.txt
index b416bdb99a..6a92569d14 100644
--- a/Tests/unit/core/CMakeLists.txt
+++ b/Tests/unit/core/CMakeLists.txt
@@ -98,7 +98,7 @@ add_executable(${TEST_RUNNER_NAME}
    test_jwt.cpp
 )
 
-target_include_directories(${TEST_RUNNER_NAME} PRIVATE ${CMAKE_SOURCE_DIR}/Source/extensions)
+target_include_directories(${TEST_RUNNER_NAME} PRIVATE ${CMAKE_SOURCE_DIR}/Source/addons)
 target_include_directories(${TEST_RUNNER_NAME} PRIVATE ${CMAKE_SOURCE_DIR}/Source/Thunder)
 
 #[[
diff --git a/Tests/unit/core/test_extensions.cpp b/Tests/unit/core/test_extensions.cpp
index 02c8cb0b02..16573c1bac 100644
--- a/Tests/unit/core/test_extensions.cpp
+++ b/Tests/unit/core/test_extensions.cpp
@@ -33,14 +33,14 @@
 #include <core/WarningReportingCategories.h>
 
 // Pull in the process-container helper headers (header-only, no backend needed)
-// Note: CMakeLists adds Source/extensions to the include path so that
+// Note: CMakeLists adds Source/addons to the include path so that
 // BaseContainerIterator.h's #include "processcontainers/IProcessContainers.h" resolves.
 #include <processcontainers/IProcessContainers.h>
 #include <processcontainers/common/BaseRefCount.h>
 #include <processcontainers/common/BaseContainerIterator.h>
 
 // Hibernate C API header (for error constant validation)
-#include <extensions/hibernate/hibernate.h>
+#include <addons/hibernate/hibernate.h>
 
 // If the proxy was not compiled into the library (WARNING_REPORTING=OFF),
 // pull in the implementation so the linker can find it.
diff --git a/docs/plugin/messaging.md b/docs/plugin/messaging.md
index 29bae82a0f..0a2a39acd9 100644
--- a/docs/plugin/messaging.md
+++ b/docs/plugin/messaging.md
@@ -173,7 +173,7 @@ Below is an example of the messaging section in the config:
 Warning Reporting enables various runtime checks for potentially erroneous conditions and can be enabled on a per-category basis. These are typically time-based - i.e. a warning will be reported if something exceeded an allowable time. Each category can also have its own configuration to tune the thresholds for triggering the warning.
 
 !!! warning
-	Warning Reporting is only available if Thunder is compiled with the `WARNING_REPORTING` option, which can be found [here](https://github.com/rdkcentral/Thunder/blob/76e08e2e5eafa12272b9080d2680091824124d9c/Source/extensions/CMakeLists.txt#L26), and is disabled by default. Note that it should not be enabled in Production, since it not only leads to a higher CPU and memory usage, but also it does not add any value to have it turned on in Production.
+	Warning Reporting is only available if Thunder is compiled with the `WARNING_REPORTING` option, which can be found [here](../../Source/addons/CMakeLists.txt), and is disabled by default. Note that it should not be enabled in Production, since it not only leads to a higher CPU and memory usage, but also it does not add any value to have it turned on in Production.
 
 ### Runtime