diff --git a/Reconstruction/RecGenfitAlg/CMakeLists.txt b/Reconstruction/RecGenfitAlg/CMakeLists.txt
index 566801d154c2fb36a98a609303ade9b288e6cd01..ee9b043000c6c0f20ae819b020c2e0302120b249 100644
--- a/Reconstruction/RecGenfitAlg/CMakeLists.txt
+++ b/Reconstruction/RecGenfitAlg/CMakeLists.txt
@@ -23,6 +23,7 @@ gaudi_add_module(RecGenfitAlg
 )
 
 target_include_directories(RecGenfitAlg PUBLIC
+        ${LCIO_INCLUDE_DIRS}
         $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}>/include
         $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
 )
diff --git a/Simulation/DetSimGeom/src/AnExampleDetElemTool.cpp b/Simulation/DetSimGeom/src/AnExampleDetElemTool.cpp
index ff20af31bc40cd2d24304e83e2c9bbadffc6a171..fb2c1126b79293482e3c66c6ebb3ffe9681302d7 100644
--- a/Simulation/DetSimGeom/src/AnExampleDetElemTool.cpp
+++ b/Simulation/DetSimGeom/src/AnExampleDetElemTool.cpp
@@ -76,6 +76,14 @@ AnExampleDetElemTool::getLV() {
 
 void
 AnExampleDetElemTool::ConstructSDandField() {
+
+    // DEBUG ONLY: turn off all the SD.
+    if (not m_SD_enabled) {
+        warning() << "All the Sensitive Detectors will be disabled by default. " << endmsg;
+        return;
+    }
+
+
     //
     // Construct SD using DD4hep.
     // Refer to FCCSW/Detector/DetComponents/src/
diff --git a/Simulation/DetSimGeom/src/AnExampleDetElemTool.h b/Simulation/DetSimGeom/src/AnExampleDetElemTool.h
index 0fd9c35627c5dfc56e4d09fa2370bfc79ce827e0..1b3a923f1f317a3c5e35b9d5d54eb30c84a0b097 100644
--- a/Simulation/DetSimGeom/src/AnExampleDetElemTool.h
+++ b/Simulation/DetSimGeom/src/AnExampleDetElemTool.h
@@ -31,6 +31,8 @@ private:
     // DD4hep XML compact file path
     Gaudi::Property<std::string> m_dd4hep_xmls{this, "detxml"};
 
+    Gaudi::Property<bool> m_SD_enabled{this, "SDenabled", true};
+
     SmartIF<IGeomSvc> m_geosvc;
     ToolHandle<ISensDetTool> m_calo_sdtool;
     ToolHandle<ISensDetTool> m_driftchamber_sdtool;
diff --git a/Simulation/DetSimSD/src/CalorimeterSensDetTool.cpp b/Simulation/DetSimSD/src/CalorimeterSensDetTool.cpp
index 4219802f2f0df1bdc46be9552fd9661b3376295e..f213a3b45282384f9cbdfdba788b7a8a2760046d 100644
--- a/Simulation/DetSimSD/src/CalorimeterSensDetTool.cpp
+++ b/Simulation/DetSimSD/src/CalorimeterSensDetTool.cpp
@@ -43,7 +43,7 @@ CalorimeterSensDetTool::createSD(const std::string& name) {
       }
     }
     G4VSensitiveDetector* sd = new CaloSensitiveDetector(name, *dd4hep_geo, is_merge_enabled);
-    debug() << name << " set to merge true/false = " << is_merge_enabled << endmsg;
+    warning() << name << " set to merge true/false = " << is_merge_enabled << endmsg;
 
     return sd;
 }