diff --git a/Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml b/Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml
new file mode 100644
index 0000000000000..eea18574c135e
--- /dev/null
+++ b/Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml b/Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml
new file mode 100644
index 0000000000000..fe9d9e120887d
--- /dev/null
+++ b/Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Geometry/MuonCommonData/data/dd4hep/testGE0XML.xml b/Geometry/MuonCommonData/data/dd4hep/testGE0XML.xml
index 87d78299c4dbd..5c6f30635109b 100644
--- a/Geometry/MuonCommonData/data/dd4hep/testGE0XML.xml
+++ b/Geometry/MuonCommonData/data/dd4hep/testGE0XML.xml
@@ -8,12 +8,12 @@
-
+
-
+
-
+
@@ -24,23 +24,23 @@
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
+
+
diff --git a/Geometry/MuonCommonData/data/dd4hep/testGEMXML.xml b/Geometry/MuonCommonData/data/dd4hep/testGEMXML.xml
index 13ec780499fcd..1a705c9a8c17b 100644
--- a/Geometry/MuonCommonData/data/dd4hep/testGEMXML.xml
+++ b/Geometry/MuonCommonData/data/dd4hep/testGEMXML.xml
@@ -8,15 +8,15 @@
-
+
-
+
-
+
-
+
@@ -41,8 +41,8 @@
-
-
+
+
diff --git a/Geometry/MuonCommonData/data/mf/2026/v7/mf.xml b/Geometry/MuonCommonData/data/mf/2026/v7/mf.xml
new file mode 100644
index 0000000000000..2a94315a50b5a
--- /dev/null
+++ b/Geometry/MuonCommonData/data/mf/2026/v7/mf.xml
@@ -0,0 +1,222 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Geometry/MuonCommonData/data/mfshield/2026/v5/mfshield.xml b/Geometry/MuonCommonData/data/mfshield/2026/v5/mfshield.xml
new file mode 100644
index 0000000000000..8a085f336cab7
--- /dev/null
+++ b/Geometry/MuonCommonData/data/mfshield/2026/v5/mfshield.xml
@@ -0,0 +1,666 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v3/muonNumbering.xml b/Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v3/muonNumbering.xml
new file mode 100644
index 0000000000000..8cb3da8baf4ba
--- /dev/null
+++ b/Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v3/muonNumbering.xml
@@ -0,0 +1,485 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Geometry/MuonCommonData/python/testGE0XML_cfi.py b/Geometry/MuonCommonData/python/testGE0XML_cfi.py
index c6dc7fefe4133..5de8ef75bbff6 100644
--- a/Geometry/MuonCommonData/python/testGE0XML_cfi.py
+++ b/Geometry/MuonCommonData/python/testGE0XML_cfi.py
@@ -6,12 +6,12 @@
'Geometry/CMSCommonData/data/rotations.xml',
'Geometry/CMSCommonData/data/extend/v2/cmsextent.xml',
'Geometry/CMSCommonData/data/cavernData/2021/v1/cavernData.xml',
- 'Geometry/CMSCommonData/data/cms/2026/v3/cms.xml',
+ 'Geometry/CMSCommonData/data/cms/2026/v5/cms.xml',
'Geometry/CMSCommonData/data/cmsMother.xml',
'Geometry/CMSCommonData/data/eta3/etaMax.xml',
- 'Geometry/CMSCommonData/data/caloBase/2026/v2/caloBase.xml',
+ 'Geometry/CMSCommonData/data/caloBase/2026/v5/caloBase.xml',
'Geometry/CMSCommonData/data/cmsCalo.xml',
- 'Geometry/CMSCommonData/data/muonBase/2026/v3/muonBase.xml',
+ 'Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml',
'Geometry/CMSCommonData/data/cmsMuon.xml',
'Geometry/CMSCommonData/data/muonMB.xml',
'Geometry/CMSCommonData/data/muonMagnet.xml',
@@ -22,24 +22,23 @@
'Geometry/MuonCommonData/data/mb3/2015/v2/mb3.xml',
'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
- 'Geometry/MuonCommonData/data/muonYoke/2021/v2/muonYoke.xml',
- 'Geometry/MuonCommonData/data/csc/2021/v1/csc.xml',
- 'Geometry/MuonCommonData/data/mfshield/2017/v1/mfshield.xml',
- 'Geometry/MuonCommonData/data/mf/2026/v4/mf.xml',
- 'Geometry/MuonCommonData/data/rpcf/2026/v2/rpcf.xml',
+ 'Geometry/MuonCommonData/data/muonYoke/2026/v1/muonYoke.xml',
+ 'Geometry/MuonCommonData/data/mf/2026/v7/mf.xml',
+ 'Geometry/MuonCommonData/data/csc/2021/v2/csc.xml',
+ 'Geometry/MuonCommonData/data/rpcf/2026/v3/rpcf.xml',
'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
- 'Geometry/MuonCommonData/data/gem21/TDR_Dev/gem21.xml',
- 'Geometry/MuonCommonData/data/mfshield/2026/v2/mfshield.xml',
- 'Geometry/MuonCommonData/data/ge0/TDR_Dev/v2/ge0.xml',
- 'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v2/muonNumbering.xml',
+ 'Geometry/MuonCommonData/data/gem21/TDR_Eta16/gem21.xml',
+ 'Geometry/MuonCommonData/data/mfshield/2026/v5/mfshield.xml',
+ 'Geometry/MuonCommonData/data/ge0/TDR_Dev/v3/ge0.xml',
+ 'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v3/muonNumbering.xml',
'Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml',
'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml',
'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
'Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml',
- 'Geometry/GEMGeometryBuilder/data/v9/GEMSpecsFilter.xml',
- 'Geometry/GEMGeometryBuilder/data/v9/GEMSpecs.xml',
+ 'Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml',
+ 'Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml',
'Geometry/MuonSimData/data/PhaseII/muonProdCuts.xml',
'Geometry/CMSCommonData/data/FieldParameters.xml',
),
diff --git a/Geometry/MuonCommonData/python/testGEMXML_cfi.py b/Geometry/MuonCommonData/python/testGEMXML_cfi.py
index 2ce46e16fa065..3267616d30a95 100644
--- a/Geometry/MuonCommonData/python/testGEMXML_cfi.py
+++ b/Geometry/MuonCommonData/python/testGEMXML_cfi.py
@@ -6,15 +6,15 @@
'Geometry/CMSCommonData/data/rotations.xml',
'Geometry/CMSCommonData/data/extend/v2/cmsextent.xml',
'Geometry/CMSCommonData/data/cavernData/2021/v1/cavernData.xml',
- 'Geometry/CMSCommonData/data/cms/2026/v3/cms.xml',
+ 'Geometry/CMSCommonData/data/cms/2026/v5/cms.xml',
'Geometry/CMSCommonData/data/cmsMother.xml',
'Geometry/CMSCommonData/data/eta3/etaMax.xml',
- 'Geometry/CMSCommonData/data/caloBase/2026/v2/caloBase.xml',
+ 'Geometry/CMSCommonData/data/caloBase/2026/v5/caloBase.xml',
'Geometry/CMSCommonData/data/cmsCalo.xml',
- 'Geometry/CMSCommonData/data/muonBase/2026/v3/muonBase.xml',
+ 'Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml',
'Geometry/CMSCommonData/data/cmsMuon.xml',
'Geometry/CMSCommonData/data/mgnt.xml',
- 'Geometry/CMSCommonData/data/beampipe/2026/v1/beampipe.xml',
+ 'Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml',
'Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml',
'Geometry/CMSCommonData/data/muonMB.xml',
'Geometry/CMSCommonData/data/muonMagnet.xml',
@@ -24,23 +24,23 @@
'Geometry/MuonCommonData/data/mb3/2015/v2/mb3.xml',
'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
- 'Geometry/MuonCommonData/data/muonYoke/2021/v3/muonYoke.xml',
+ 'Geometry/MuonCommonData/data/muonYoke/2026/v1/muonYoke.xml',
+ 'Geometry/MuonCommonData/data/mf/2026/v6/mf.xml',
'Geometry/MuonCommonData/data/csc/2021/v2/csc.xml',
- 'Geometry/MuonCommonData/data/mf/2026/v3/mf.xml',
'Geometry/MuonCommonData/data/rpcf/2026/v3/rpcf.xml',
'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
'Geometry/MuonCommonData/data/gem21/TDR_Eta16/gem21.xml',
- 'Geometry/MuonCommonData/data/me0/TDR_Dev/v2/me0.xml',
- 'Geometry/MuonCommonData/data/mfshield/2026/v1/mfshield.xml',
+ 'Geometry/MuonCommonData/data/me0/TDR_Dev/v3/me0.xml',
+ 'Geometry/MuonCommonData/data/mfshield/2026/v4/mfshield.xml',
'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v1/muonNumbering.xml',
'Geometry/MuonSimData/data/PhaseII/ME0EtaPart/muonSens.xml',
'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml',
'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
'Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml',
- 'Geometry/GEMGeometryBuilder/data/v7/GEMSpecsFilter.xml',
- 'Geometry/GEMGeometryBuilder/data/v7/GEMSpecs.xml',
+ 'Geometry/GEMGeometryBuilder/data/v11/GEMSpecsFilter.xml',
+ 'Geometry/GEMGeometryBuilder/data/v11/GEMSpecs.xml',
'Geometry/MuonSimData/data/PhaseII/muonProdCuts.xml',
'Geometry/CMSCommonData/data/FieldParameters.xml'
),
diff --git a/Geometry/MuonCommonData/test/dumpGE0_cfg.py b/Geometry/MuonCommonData/test/python/dumpGE0_cfg.py
similarity index 100%
rename from Geometry/MuonCommonData/test/dumpGE0_cfg.py
rename to Geometry/MuonCommonData/test/python/dumpGE0_cfg.py
diff --git a/Geometry/MuonCommonData/test/dumpGEM_cfg.py b/Geometry/MuonCommonData/test/python/dumpGEM_cfg.py
similarity index 100%
rename from Geometry/MuonCommonData/test/dumpGEM_cfg.py
rename to Geometry/MuonCommonData/test/python/dumpGEM_cfg.py
diff --git a/Geometry/MuonCommonData/test/runME_cfg.py b/Geometry/MuonCommonData/test/python/runME_cfg.py
similarity index 100%
rename from Geometry/MuonCommonData/test/runME_cfg.py
rename to Geometry/MuonCommonData/test/python/runME_cfg.py