diff --git a/MuonSpectrometer/MuonConfig/python/MuonConfigFlags.py b/MuonSpectrometer/MuonConfig/python/MuonConfigFlags.py
index 6689d4562bfa266d1be3b10eb827f93203818b4d..301e37630fe4fbcd40e829145d8ef77865615edb 100644
--- a/MuonSpectrometer/MuonConfig/python/MuonConfigFlags.py
+++ b/MuonSpectrometer/MuonConfig/python/MuonConfigFlags.py
@@ -133,6 +133,8 @@ def createMuonConfigFlags():
     # configuration to write out RPC RDO for trigger timing calibration
     mcf.addFlag("Muon.doWriteRpcRDO", True)
 
+    mcf.addFlag("Muon.writeSDOs", lambda prevFlags : prevFlags.Output.doWriteESD and prevFlags.Input.isMC)
+
     # TODO - add configuration for above    
         
     return mcf
diff --git a/MuonSpectrometer/MuonConfig/python/MuonReconstructionConfig.py b/MuonSpectrometer/MuonConfig/python/MuonReconstructionConfig.py
index 3ae8b39838402423dda022237cc4f36e71fa0414..7d1d219c7755540549c87dac2ae0adf919e93133 100644
--- a/MuonSpectrometer/MuonConfig/python/MuonReconstructionConfig.py
+++ b/MuonSpectrometer/MuonConfig/python/MuonReconstructionConfig.py
@@ -124,15 +124,13 @@ def StandaloneMuonOutputCfg(flags):
         esd_items += ["DetailedTrackTruthCollection#MuonSpectrometerTracksTruth"]
         esd_items += ["TrackTruthCollection#MuonSpectrometerTracksTruth"]
 
-        # Since this is only used for debugging, probably okay not to have a writeSDO flag..
-        # Leaving this here for the moment in case this turns out to be a mistake.
-        # if muonRecFlags.writeSDOs():
-        #     if flags.Detector.EnableCSC: esd_items+=["CscSimDataCollection#CSC_SDO"]
-        #     esd_items+=["MuonSimDataCollection#MDT_SDO"]
-        #     esd_items+=["MuonSimDataCollection#RPC_SDO"]
-        #     esd_items+=["MuonSimDataCollection#TGC_SDO"]
-        #     if flags.Detector.EnablesTGC: esd_items+=["MuonSimDataCollection#sTGC_SDO"]
-        #     if flags.Detector.EnableMM: esd_items+=["MuonSimDataCollection#MM_SDO"]
+        if flags.Muon.writeSDOs:
+            if flags.Detector.EnableCSC: esd_items+=["CscSimDataCollection#CSC_SDO"]
+            esd_items+=["MuonSimDataCollection#MDT_SDO"]
+            esd_items+=["MuonSimDataCollection#RPC_SDO"]
+            esd_items+=["MuonSimDataCollection#TGC_SDO"]
+            if flags.Detector.EnablesTGC: esd_items+=["MuonSimDataCollection#sTGC_SDO"]
+            if flags.Detector.EnableMM: esd_items+=["MuonSimDataCollection#MM_SDO"]
 
     if flags.Output.doWriteESD:
         result.merge(OutputStreamCfg(flags, "ESD", esd_items))
diff --git a/Tools/WorkflowTestRunner/python/References.py b/Tools/WorkflowTestRunner/python/References.py
index f23d18fa779a4292940beb67e8545283c8af8390..4dfeb401a29c48dcadf11f3b4d3951a894dc3947 100644
--- a/Tools/WorkflowTestRunner/python/References.py
+++ b/Tools/WorkflowTestRunner/python/References.py
@@ -24,6 +24,6 @@ references_map = {
     # Reco
     "q442": "v4",
     "q443": "v3",
-    "q445": "v3",
+    "q445": "v4",
     "q449": "v4",
 }