diff --git a/tests/sumo/config.sumo b/tests/sumo/config.sumo
index 5735487adcfd..077bcfc7257d 100644
--- a/tests/sumo/config.sumo
+++ b/tests/sumo/config.sumo
@@ -99,6 +99,7 @@ tripinfosPrefix:pre_tripinfos.xml
 logPrefixed:pre_log.txt
 weights:weights.xml
 lanechanges:lanechanges.xml
+deadlocks:deadlocks.xml
 ssm:ssm.xml
 ssm2:ssm_ego.xml
 png:out.png
@@ -200,6 +201,7 @@ cfg:JuPedSim
 cfg:^$
 weights:<!--{[->]}-->
 lanechanges:<!--{[->]}-->
+deadlocks:<!--{[->]}-->
 ps:%%CreationDate
 ps2:%%CreationDate
 statistic:<performance
diff --git a/tests/sumo/meta/help/output.sumo b/tests/sumo/meta/help/output.sumo
index c4950ce086db..194bebffbe16 100644
--- a/tests/sumo/meta/help/output.sumo
+++ b/tests/sumo/meta/help/output.sumo
@@ -1,4 +1,4 @@
-Eclipse SUMO sumo Version v1_20_0+0439-a8f3c62bd15
+Eclipse SUMO sumo Version v1_20_0+0627-9f0eaa86dc7
  Copyright (C) 2001-2024 German Aerospace Center (DLR) and others; https://sumo.dlr.de
 A microscopic, multi-modal traffic simulation.
 
@@ -163,6 +163,7 @@ Output Options:
   --lanedata-output FILE               Write aggregated traffic statistics for
                                         all lanes into FILE
   --statistic-output FILE              Write overall statistics into FILE
+  --deadlock-output FILE               Write reports on deadlocks FILE
   --save-state.times STR[]             Use TIME[] as times at which a network
                                         state written
   --save-state.period TIME             save state repeatedly after TIME period
@@ -267,6 +268,9 @@ Processing Options:
                                         teleporting
   --time-to-teleport.bidi TIME         The waiting time after which vehicles on
                                         bidirectional edges are teleported
+  --time-to-teleport.railsignal-deadlock TIME  The waiting time after which
+                                        vehicles in a rail-signal based deadlock
+                                        are teleported
   --waiting-time-memory TIME           Length of time interval, over which
                                         accumulated waiting time is taken into
                                         account (default is 100s.)
diff --git a/tests/sumo/meta/write_schema/cfg.sumo b/tests/sumo/meta/write_schema/cfg.sumo
index 52ab5eece884..575d9b7dea53 100644
--- a/tests/sumo/meta/write_schema/cfg.sumo
+++ b/tests/sumo/meta/write_schema/cfg.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-07-04 15:15:32 by Eclipse SUMO sumo Version v1_20_0+0439-a8f3c62bd15
+<!-- generated on 2024-10-09 09:59:48 by Eclipse SUMO sumo Version v1_20_0+0627-9f0eaa86dc7
 -->
 
 <xsd:schema elementFormDefault="qualified" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
@@ -128,6 +128,7 @@
             <xsd:element name="edgedata-output" type="fileOptionType" minOccurs="0"/>
             <xsd:element name="lanedata-output" type="fileOptionType" minOccurs="0"/>
             <xsd:element name="statistic-output" type="fileOptionType" minOccurs="0"/>
+            <xsd:element name="deadlock-output" type="fileOptionType" minOccurs="0"/>
             <xsd:element name="save-state.times" type="strArrayOptionType" minOccurs="0"/>
             <xsd:element name="save-state.period" type="timeOptionType" minOccurs="0"/>
             <xsd:element name="save-state.period.keep" type="intOptionType" minOccurs="0"/>
@@ -182,6 +183,7 @@
             <xsd:element name="time-to-teleport.remove" type="boolOptionType" minOccurs="0"/>
             <xsd:element name="time-to-teleport.ride" type="timeOptionType" minOccurs="0"/>
             <xsd:element name="time-to-teleport.bidi" type="timeOptionType" minOccurs="0"/>
+            <xsd:element name="time-to-teleport.railsignal-deadlock" type="timeOptionType" minOccurs="0"/>
             <xsd:element name="waiting-time-memory" type="timeOptionType" minOccurs="0"/>
             <xsd:element name="startup-wait-threshold" type="timeOptionType" minOccurs="0"/>
             <xsd:element name="max-depart-delay" type="timeOptionType" minOccurs="0"/>
diff --git a/tests/sumo/meta/write_template_commented_full/cfg.sumo b/tests/sumo/meta/write_template_commented_full/cfg.sumo
index 1b64c5d4c14a..a2316f372c1f 100644
--- a/tests/sumo/meta/write_template_commented_full/cfg.sumo
+++ b/tests/sumo/meta/write_template_commented_full/cfg.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-07-04 15:15:32 by Eclipse SUMO sumo Version v1_20_0+0439-a8f3c62bd15
+<!-- generated on 2024-10-09 09:59:48 by Eclipse SUMO sumo Version v1_20_0+0627-9f0eaa86dc7
 -->
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
@@ -276,6 +276,9 @@
         <!-- Write overall statistics into FILE -->
         <statistic-output value="" synonymes="statistics-output" type="FILE"/>
 
+        <!-- Write reports on deadlocks FILE -->
+        <deadlock-output value="" type="FILE"/>
+
         <!-- Use TIME[] as times at which a network state written -->
         <save-state.times value="" type="STR[]"/>
 
@@ -414,6 +417,9 @@
         <!-- The waiting time after which vehicles on bidirectional edges are teleported -->
         <time-to-teleport.bidi value="-1" type="TIME"/>
 
+        <!-- The waiting time after which vehicles in a rail-signal based deadlock are teleported -->
+        <time-to-teleport.railsignal-deadlock value="-1" type="TIME"/>
+
         <!-- Length of time interval, over which accumulated waiting time is taken into account (default is 100s.) -->
         <waiting-time-memory value="100" type="TIME"/>
 
diff --git a/tests/sumo/meta/write_template_full/cfg.sumo b/tests/sumo/meta/write_template_full/cfg.sumo
index 989befe46ae2..ab13dd4fcb01 100644
--- a/tests/sumo/meta/write_template_full/cfg.sumo
+++ b/tests/sumo/meta/write_template_full/cfg.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-07-04 15:15:32 by Eclipse SUMO sumo Version v1_20_0+0439-a8f3c62bd15
+<!-- generated on 2024-10-09 09:59:48 by Eclipse SUMO sumo Version v1_20_0+0627-9f0eaa86dc7
 -->
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
@@ -100,6 +100,7 @@
         <edgedata-output value="" type="FILE" help="Write aggregated traffic statistics for all edges into FILE"/>
         <lanedata-output value="" type="FILE" help="Write aggregated traffic statistics for all lanes into FILE"/>
         <statistic-output value="" synonymes="statistics-output" type="FILE" help="Write overall statistics into FILE"/>
+        <deadlock-output value="" type="FILE" help="Write reports on deadlocks FILE"/>
         <save-state.times value="" type="STR[]" help="Use TIME[] as times at which a network state written"/>
         <save-state.period value="-1" type="TIME" help="save state repeatedly after TIME period"/>
         <save-state.period.keep value="0" type="INT" help="Keep only the last INT periodic state files"/>
@@ -150,6 +151,7 @@
         <time-to-teleport.remove value="false" type="BOOL" help="Whether vehicles shall be removed after waiting too long instead of being teleported"/>
         <time-to-teleport.ride value="-1" type="TIME" help="The waiting time after which persons / containers waiting for a pickup are teleported. Negative values disable teleporting"/>
         <time-to-teleport.bidi value="-1" type="TIME" help="The waiting time after which vehicles on bidirectional edges are teleported"/>
+        <time-to-teleport.railsignal-deadlock value="-1" type="TIME" help="The waiting time after which vehicles in a rail-signal based deadlock are teleported"/>
         <waiting-time-memory value="100" type="TIME" help="Length of time interval, over which accumulated waiting time is taken into account (default is 100s.)"/>
         <startup-wait-threshold value="2" type="TIME" help="Minimum consecutive waiting time before applying startupDelay"/>
         <max-depart-delay value="-1" type="TIME" help="How long vehicles wait for departure before being skipped, defaults to -1 which means vehicles are never skipped"/>
diff --git a/tests/sumo/rail/options.sumo b/tests/sumo/rail/options.sumo
index 82332c304f02..8c15a2cae28f 100644
--- a/tests/sumo/rail/options.sumo
+++ b/tests/sumo/rail/options.sumo
@@ -1 +1,2 @@
 --railsignal-block-output railsignal_blocks.xml
+--time-to-teleport.railsignal-deadlock 200
diff --git a/tests/sumo/rail/siding/circle_3veh/deadlocks.sumo b/tests/sumo/rail/siding/circle_3veh/deadlocks.sumo
new file mode 100644
index 000000000000..46822fac95ed
--- /dev/null
+++ b/tests/sumo/rail/siding/circle_3veh/deadlocks.sumo
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- generated on 2024-10-09 09:58:26 by Eclipse SUMO sumo Version v1_20_0+0627-9f0eaa86dc7
+This data file and the accompanying materials
+are made available under the terms of the Eclipse Public License v2.0
+which accompanies this distribution, and is available at
+http://www.eclipse.org/legal/epl-v20.html
+This file may also be made available under the following Secondary
+Licenses when the conditions for such availability set forth in the Eclipse
+Public License 2.0 are satisfied: GNU General Public License, version 2
+or later which is available at
+https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
+SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
+
+    <input>
+        <net-file value="net.net.xml"/>
+        <route-files value="input_routes.rou.xml"/>
+    </input>
+
+    <output>
+        <write-license value="true"/>
+        <tripinfo-output value="tripinfos.xml"/>
+        <railsignal-block-output value="railsignal_blocks.xml"/>
+        <deadlock-output value="deadlocks.xml"/>
+    </output>
+
+    <processing>
+        <time-to-teleport.railsignal-deadlock value="200"/>
+        <default.speeddev value="0"/>
+    </processing>
+
+    <report>
+        <xml-validation value="never"/>
+        <duration-log.disable value="true"/>
+        <no-step-log value="true"/>
+    </report>
+
+</configuration>
+-->
+
+<additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
+    <deadlock time="243.00" signals="C A B" vehicles="t0 t1 t2"/>
+</additional>
diff --git a/tests/sumo/rail/siding/circle_3veh/errors.sumo b/tests/sumo/rail/siding/circle_3veh/errors.sumo
index 4e8fd75e8bd5..d1cefa5db6cf 100644
--- a/tests/sumo/rail/siding/circle_3veh/errors.sumo
+++ b/tests/sumo/rail/siding/circle_3veh/errors.sumo
@@ -1,4 +1,2 @@
-Warning: Teleporting vehicle 't2'; waited too long (yield), lane='c_0', time=343.00.
-Warning: Teleporting vehicle 't0'; waited too long (yield), lane='a_0', time=357.00.
-Warning: Vehicle 't2' ends teleporting on edge 'a', time=357.00.
-Warning: Vehicle 't0' ends teleporting on edge 'b', time=363.00.
+Warning: Teleporting vehicle 't2'; waited too long (yield, railSignal), lane='c_0', time=243.00.
+Warning: Vehicle 't2' ends teleporting on edge 'a', time=283.00.
diff --git a/tests/sumo/rail/siding/circle_3veh/tripinfos.sumo b/tests/sumo/rail/siding/circle_3veh/tripinfos.sumo
index 648a45c855d1..e1afbb7b37ee 100644
--- a/tests/sumo/rail/siding/circle_3veh/tripinfos.sumo
+++ b/tests/sumo/rail/siding/circle_3veh/tripinfos.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-10-08 08:28:01 by Eclipse SUMO sumo Version v1_20_0+0623-4d64fbde829
+<!-- generated on 2024-10-09 09:58:26 by Eclipse SUMO sumo Version v1_20_0+0627-9f0eaa86dc7
 This data file and the accompanying materials
 are made available under the terms of the Eclipse Public License v2.0
 which accompanies this distribution, and is available at
@@ -22,9 +22,11 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <write-license value="true"/>
         <tripinfo-output value="tripinfos.xml"/>
         <railsignal-block-output value="railsignal_blocks.xml"/>
+        <deadlock-output value="deadlocks.xml"/>
     </output>
 
     <processing>
+        <time-to-teleport.railsignal-deadlock value="200"/>
         <default.speeddev value="0"/>
     </processing>
 
@@ -38,7 +40,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
 -->
 
 <tripinfos xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/tripinfo_file.xsd">
-    <tripinfo id="t2" depart="0.00" departLane="c_0" departPos="50.10" departSpeed="0.00" departDelay="0.00" arrival="419.00" arrivalLane="b_0" arrivalPos="340.10" arrivalSpeed="12.20" duration="419.00" routeLength="912.88" waitingTime="301.00" waitingCount="1" stopTime="0.00" timeLoss="342.77" rerouteNo="1" devices="tripinfo_t2 routing_t2" vType="train" speedFactor="1.00" vaporized=""/>
-    <tripinfo id="t1" depart="0.00" departLane="b_0" departPos="50.10" departSpeed="0.00" departDelay="0.00" arrival="426.00" arrivalLane="a_0" arrivalPos="381.52" arrivalSpeed="13.89" duration="426.00" routeLength="914.16" waitingTime="291.00" waitingCount="1" stopTime="0.00" timeLoss="360.04" rerouteNo="1" devices="tripinfo_t1 routing_t1" vType="train" speedFactor="1.00" vaporized=""/>
-    <tripinfo id="t0" depart="0.00" departLane="a_0" departPos="50.10" departSpeed="0.00" departDelay="0.00" arrival="439.00" arrivalLane="c_0" arrivalPos="240.10" arrivalSpeed="11.00" duration="439.00" routeLength="912.88" waitingTime="307.00" waitingCount="2" stopTime="0.00" timeLoss="370.52" rerouteNo="1" devices="tripinfo_t0 routing_t0" vType="train" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="t0" depart="0.00" departLane="a_0" departPos="50.10" departSpeed="0.00" departDelay="0.00" arrival="345.00" arrivalLane="c_0" arrivalPos="240.10" arrivalSpeed="11.88" duration="345.00" routeLength="914.14" waitingTime="207.00" waitingCount="1" stopTime="0.00" timeLoss="278.51" rerouteNo="1" devices="tripinfo_t0 routing_t0" vType="train" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="t1" depart="0.00" departLane="b_0" departPos="50.10" departSpeed="0.00" departDelay="0.00" arrival="346.00" arrivalLane="a_0" arrivalPos="381.52" arrivalSpeed="5.25" duration="346.00" routeLength="914.16" waitingTime="191.00" waitingCount="1" stopTime="0.00" timeLoss="280.00" rerouteNo="1" devices="tripinfo_t1 routing_t1" vType="train" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="t2" depart="0.00" departLane="c_0" departPos="50.10" departSpeed="0.00" departDelay="0.00" arrival="376.00" arrivalLane="b_0" arrivalPos="340.10" arrivalSpeed="13.00" duration="376.00" routeLength="912.88" waitingTime="213.00" waitingCount="2" stopTime="0.00" timeLoss="273.74" rerouteNo="1" devices="tripinfo_t2 routing_t2" vType="train" speedFactor="1.00" vaporized=""/>
 </tripinfos>
diff --git a/tests/sumo/rail/siding/loop_3veh/deadlocks.sumo b/tests/sumo/rail/siding/loop_3veh/deadlocks.sumo
new file mode 100644
index 000000000000..0c4f8dd62432
--- /dev/null
+++ b/tests/sumo/rail/siding/loop_3veh/deadlocks.sumo
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- generated on 2024-10-09 09:46:20 by Eclipse SUMO sumo Version v1_20_0+0627-9f0eaa86dc7
+This data file and the accompanying materials
+are made available under the terms of the Eclipse Public License v2.0
+which accompanies this distribution, and is available at
+http://www.eclipse.org/legal/epl-v20.html
+This file may also be made available under the following Secondary
+Licenses when the conditions for such availability set forth in the Eclipse
+Public License 2.0 are satisfied: GNU General Public License, version 2
+or later which is available at
+https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
+SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
+
+    <input>
+        <net-file value="net.net.xml"/>
+        <route-files value="input_routes.rou.xml"/>
+    </input>
+
+    <output>
+        <write-license value="true"/>
+        <tripinfo-output value="tripinfos.xml"/>
+        <railsignal-block-output value="railsignal_blocks.xml"/>
+        <deadlock-output value="deadlocks.xml"/>
+    </output>
+
+    <processing>
+        <time-to-teleport.railsignal-deadlock value="200"/>
+        <default.speeddev value="0"/>
+    </processing>
+
+    <report>
+        <xml-validation value="never"/>
+        <duration-log.disable value="true"/>
+        <no-step-log value="true"/>
+    </report>
+
+</configuration>
+-->
+
+<additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
+</additional>
diff --git a/tests/sumo/rail/siding/loop_4veh/deadlocks.sumo b/tests/sumo/rail/siding/loop_4veh/deadlocks.sumo
new file mode 100644
index 000000000000..0e5fbdebf7f7
--- /dev/null
+++ b/tests/sumo/rail/siding/loop_4veh/deadlocks.sumo
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- generated on 2024-10-09 09:58:26 by Eclipse SUMO sumo Version v1_20_0+0627-9f0eaa86dc7
+This data file and the accompanying materials
+are made available under the terms of the Eclipse Public License v2.0
+which accompanies this distribution, and is available at
+http://www.eclipse.org/legal/epl-v20.html
+This file may also be made available under the following Secondary
+Licenses when the conditions for such availability set forth in the Eclipse
+Public License 2.0 are satisfied: GNU General Public License, version 2
+or later which is available at
+https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
+SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
+
+    <input>
+        <net-file value="net.net.xml"/>
+        <route-files value="input_routes.rou.xml"/>
+    </input>
+
+    <output>
+        <write-license value="true"/>
+        <tripinfo-output value="tripinfos.xml"/>
+        <railsignal-block-output value="railsignal_blocks.xml"/>
+        <deadlock-output value="deadlocks.xml"/>
+    </output>
+
+    <processing>
+        <time-to-teleport.railsignal-deadlock value="200"/>
+        <default.speeddev value="0"/>
+    </processing>
+
+    <report>
+        <xml-validation value="never"/>
+        <duration-log.disable value="true"/>
+        <no-step-log value="true"/>
+    </report>
+
+</configuration>
+-->
+
+<additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
+    <deadlock time="272.00" signals="A D G C2" vehicles="t0 t3 t2 t1"/>
+</additional>
diff --git a/tests/sumo/rail/siding/loop_4veh/errors.sumo b/tests/sumo/rail/siding/loop_4veh/errors.sumo
index 85d0e7cc8b4a..7edc05b2ddb6 100644
--- a/tests/sumo/rail/siding/loop_4veh/errors.sumo
+++ b/tests/sumo/rail/siding/loop_4veh/errors.sumo
@@ -1,2 +1,2 @@
-Warning: Teleporting vehicle 't1'; waited too long (yield), lane='a_0', time=318.00.
-Warning: Vehicle 't1' ends teleporting on edge 'e', time=415.00.
+Warning: Teleporting vehicle 't1'; waited too long (yield, railSignal), lane='a_0', time=272.00.
+Warning: Vehicle 't1' ends teleporting on edge 'e', time=369.00.
diff --git a/tests/sumo/rail/siding/loop_4veh/tripinfos.sumo b/tests/sumo/rail/siding/loop_4veh/tripinfos.sumo
index a6e9ee955024..4ace36c9b8e8 100644
--- a/tests/sumo/rail/siding/loop_4veh/tripinfos.sumo
+++ b/tests/sumo/rail/siding/loop_4veh/tripinfos.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-09-27 20:52:17 by Eclipse SUMO sumo Version v1_20_0+0618-b88f2fd166e
+<!-- generated on 2024-10-09 09:58:26 by Eclipse SUMO sumo Version v1_20_0+0627-9f0eaa86dc7
 This data file and the accompanying materials
 are made available under the terms of the Eclipse Public License v2.0
 which accompanies this distribution, and is available at
@@ -22,9 +22,11 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <write-license value="true"/>
         <tripinfo-output value="tripinfos.xml"/>
         <railsignal-block-output value="railsignal_blocks.xml"/>
+        <deadlock-output value="deadlocks.xml"/>
     </output>
 
     <processing>
+        <time-to-teleport.railsignal-deadlock value="200"/>
         <default.speeddev value="0"/>
     </processing>
 
@@ -38,8 +40,8 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
 -->
 
 <tripinfos xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/tripinfo_file.xsd">
-    <tripinfo id="t2" depart="0.00" departLane="-m_0" departPos="50.10" departSpeed="13.89" departDelay="0.00" arrival="370.00" arrivalLane="-a_0" arrivalPos="100.00" arrivalSpeed="13.00" duration="370.00" routeLength="1414.50" waitingTime="205.00" waitingCount="1" stopTime="0.00" timeLoss="267.46" rerouteNo="1" devices="tripinfo_t2 routing_t2" vType="train" speedFactor="1.00" vaporized=""/>
-    <tripinfo id="t3" depart="45.00" departLane="-m_0" departPos="50.10" departSpeed="13.89" departDelay="45.00" arrival="444.00" arrivalLane="-a_0" arrivalPos="100.00" arrivalSpeed="13.88" duration="399.00" routeLength="1414.50" waitingTime="224.00" waitingCount="1" stopTime="0.00" timeLoss="296.30" rerouteNo="1" devices="tripinfo_t3 routing_t3" vType="train" speedFactor="1.00" vaporized=""/>
-    <tripinfo id="t0" depart="0.00" departLane="a_0" departPos="50.10" departSpeed="13.89" departDelay="0.00" arrival="466.00" arrivalLane="m_0" arrivalPos="100.00" arrivalSpeed="13.89" duration="466.00" routeLength="1250.65" waitingTime="103.00" waitingCount="1" stopTime="240.00" timeLoss="135.08" rerouteNo="1" devices="tripinfo_t0 routing_t0" vType="train" speedFactor="1.00" vaporized=""/>
-    <tripinfo id="t1" depart="8.00" departLane="a_0" departPos="50.10" departSpeed="10.74" departDelay="8.00" arrival="488.00" arrivalLane="-a_0" arrivalPos="100.00" arrivalSpeed="13.34" duration="480.00" routeLength="1081.85" waitingTime="301.00" waitingCount="1" stopTime="0.00" timeLoss="329.17" rerouteNo="1" devices="tripinfo_t1 routing_t1" vType="train" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="t2" depart="0.00" departLane="-m_0" departPos="50.10" departSpeed="13.89" departDelay="0.00" arrival="324.00" arrivalLane="-a_0" arrivalPos="100.00" arrivalSpeed="13.00" duration="324.00" routeLength="1414.50" waitingTime="159.00" waitingCount="1" stopTime="0.00" timeLoss="221.46" rerouteNo="1" devices="tripinfo_t2 routing_t2" vType="train" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="t3" depart="45.00" departLane="-m_0" departPos="50.10" departSpeed="13.89" departDelay="45.00" arrival="398.00" arrivalLane="-a_0" arrivalPos="100.00" arrivalSpeed="13.88" duration="353.00" routeLength="1414.50" waitingTime="178.00" waitingCount="1" stopTime="0.00" timeLoss="250.30" rerouteNo="1" devices="tripinfo_t3 routing_t3" vType="train" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="t0" depart="0.00" departLane="a_0" departPos="50.10" departSpeed="13.89" departDelay="0.00" arrival="420.00" arrivalLane="m_0" arrivalPos="100.00" arrivalSpeed="13.89" duration="420.00" routeLength="1250.65" waitingTime="57.00" waitingCount="1" stopTime="240.00" timeLoss="89.08" rerouteNo="1" devices="tripinfo_t0 routing_t0" vType="train" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="t1" depart="8.00" departLane="a_0" departPos="50.10" departSpeed="10.74" departDelay="8.00" arrival="442.00" arrivalLane="-a_0" arrivalPos="100.00" arrivalSpeed="13.34" duration="434.00" routeLength="1081.85" waitingTime="255.00" waitingCount="1" stopTime="0.00" timeLoss="283.17" rerouteNo="1" devices="tripinfo_t1 routing_t1" vType="train" speedFactor="1.00" vaporized=""/>
 </tripinfos>
diff --git a/tests/sumo/rail/siding/loop_4veh2/deadlocks.sumo b/tests/sumo/rail/siding/loop_4veh2/deadlocks.sumo
new file mode 100644
index 000000000000..0e5fbdebf7f7
--- /dev/null
+++ b/tests/sumo/rail/siding/loop_4veh2/deadlocks.sumo
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- generated on 2024-10-09 09:58:26 by Eclipse SUMO sumo Version v1_20_0+0627-9f0eaa86dc7
+This data file and the accompanying materials
+are made available under the terms of the Eclipse Public License v2.0
+which accompanies this distribution, and is available at
+http://www.eclipse.org/legal/epl-v20.html
+This file may also be made available under the following Secondary
+Licenses when the conditions for such availability set forth in the Eclipse
+Public License 2.0 are satisfied: GNU General Public License, version 2
+or later which is available at
+https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
+SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
+
+    <input>
+        <net-file value="net.net.xml"/>
+        <route-files value="input_routes.rou.xml"/>
+    </input>
+
+    <output>
+        <write-license value="true"/>
+        <tripinfo-output value="tripinfos.xml"/>
+        <railsignal-block-output value="railsignal_blocks.xml"/>
+        <deadlock-output value="deadlocks.xml"/>
+    </output>
+
+    <processing>
+        <time-to-teleport.railsignal-deadlock value="200"/>
+        <default.speeddev value="0"/>
+    </processing>
+
+    <report>
+        <xml-validation value="never"/>
+        <duration-log.disable value="true"/>
+        <no-step-log value="true"/>
+    </report>
+
+</configuration>
+-->
+
+<additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
+    <deadlock time="272.00" signals="A D G C2" vehicles="t0 t3 t2 t1"/>
+</additional>
diff --git a/tests/sumo/rail/siding/loop_4veh2/errors.sumo b/tests/sumo/rail/siding/loop_4veh2/errors.sumo
index 85d0e7cc8b4a..7edc05b2ddb6 100644
--- a/tests/sumo/rail/siding/loop_4veh2/errors.sumo
+++ b/tests/sumo/rail/siding/loop_4veh2/errors.sumo
@@ -1,2 +1,2 @@
-Warning: Teleporting vehicle 't1'; waited too long (yield), lane='a_0', time=318.00.
-Warning: Vehicle 't1' ends teleporting on edge 'e', time=415.00.
+Warning: Teleporting vehicle 't1'; waited too long (yield, railSignal), lane='a_0', time=272.00.
+Warning: Vehicle 't1' ends teleporting on edge 'e', time=369.00.
diff --git a/tests/sumo/rail/siding/loop_4veh2/tripinfos.sumo b/tests/sumo/rail/siding/loop_4veh2/tripinfos.sumo
index d0902b0bc494..e191f7bf94d0 100644
--- a/tests/sumo/rail/siding/loop_4veh2/tripinfos.sumo
+++ b/tests/sumo/rail/siding/loop_4veh2/tripinfos.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-10-07 12:39:17 by Eclipse SUMO sumo Version v1_20_0+0621-65cf8f4e151
+<!-- generated on 2024-10-09 09:58:26 by Eclipse SUMO sumo Version v1_20_0+0627-9f0eaa86dc7
 This data file and the accompanying materials
 are made available under the terms of the Eclipse Public License v2.0
 which accompanies this distribution, and is available at
@@ -22,9 +22,11 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <write-license value="true"/>
         <tripinfo-output value="tripinfos.xml"/>
         <railsignal-block-output value="railsignal_blocks.xml"/>
+        <deadlock-output value="deadlocks.xml"/>
     </output>
 
     <processing>
+        <time-to-teleport.railsignal-deadlock value="200"/>
         <default.speeddev value="0"/>
     </processing>
 
@@ -38,8 +40,8 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
 -->
 
 <tripinfos xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/tripinfo_file.xsd">
-    <tripinfo id="t2" depart="1.00" departLane="-m_0" departPos="50.10" departSpeed="13.89" departDelay="0.00" arrival="370.00" arrivalLane="-a_0" arrivalPos="100.00" arrivalSpeed="13.00" duration="369.00" routeLength="1414.50" waitingTime="204.00" waitingCount="1" stopTime="0.00" timeLoss="266.46" rerouteNo="1" devices="tripinfo_t2 routing_t2" vType="train" speedFactor="1.00" vaporized=""/>
-    <tripinfo id="t3" depart="46.00" departLane="-m_0" departPos="50.10" departSpeed="13.89" departDelay="45.00" arrival="444.00" arrivalLane="-a_0" arrivalPos="100.00" arrivalSpeed="13.88" duration="398.00" routeLength="1414.50" waitingTime="223.00" waitingCount="1" stopTime="0.00" timeLoss="295.30" rerouteNo="1" devices="tripinfo_t3 routing_t3" vType="train" speedFactor="1.00" vaporized=""/>
-    <tripinfo id="t0" depart="0.00" departLane="a_0" departPos="50.10" departSpeed="13.89" departDelay="0.00" arrival="466.00" arrivalLane="m_0" arrivalPos="100.00" arrivalSpeed="13.89" duration="466.00" routeLength="1250.65" waitingTime="103.00" waitingCount="1" stopTime="240.00" timeLoss="135.08" rerouteNo="1" devices="tripinfo_t0 routing_t0" vType="train" speedFactor="1.00" vaporized=""/>
-    <tripinfo id="t1" depart="8.00" departLane="a_0" departPos="50.10" departSpeed="10.74" departDelay="8.00" arrival="488.00" arrivalLane="-a_0" arrivalPos="100.00" arrivalSpeed="13.34" duration="480.00" routeLength="1081.85" waitingTime="301.00" waitingCount="1" stopTime="0.00" timeLoss="329.17" rerouteNo="1" devices="tripinfo_t1 routing_t1" vType="train" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="t2" depart="1.00" departLane="-m_0" departPos="50.10" departSpeed="13.89" departDelay="0.00" arrival="324.00" arrivalLane="-a_0" arrivalPos="100.00" arrivalSpeed="13.00" duration="323.00" routeLength="1414.50" waitingTime="158.00" waitingCount="1" stopTime="0.00" timeLoss="220.46" rerouteNo="1" devices="tripinfo_t2 routing_t2" vType="train" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="t3" depart="46.00" departLane="-m_0" departPos="50.10" departSpeed="13.89" departDelay="45.00" arrival="398.00" arrivalLane="-a_0" arrivalPos="100.00" arrivalSpeed="13.88" duration="352.00" routeLength="1414.50" waitingTime="177.00" waitingCount="1" stopTime="0.00" timeLoss="249.30" rerouteNo="1" devices="tripinfo_t3 routing_t3" vType="train" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="t0" depart="0.00" departLane="a_0" departPos="50.10" departSpeed="13.89" departDelay="0.00" arrival="420.00" arrivalLane="m_0" arrivalPos="100.00" arrivalSpeed="13.89" duration="420.00" routeLength="1250.65" waitingTime="57.00" waitingCount="1" stopTime="240.00" timeLoss="89.08" rerouteNo="1" devices="tripinfo_t0 routing_t0" vType="train" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="t1" depart="8.00" departLane="a_0" departPos="50.10" departSpeed="10.74" departDelay="8.00" arrival="442.00" arrivalLane="-a_0" arrivalPos="100.00" arrivalSpeed="13.34" duration="434.00" routeLength="1081.85" waitingTime="255.00" waitingCount="1" stopTime="0.00" timeLoss="283.17" rerouteNo="1" devices="tripinfo_t1 routing_t1" vType="train" speedFactor="1.00" vaporized=""/>
 </tripinfos>
diff --git a/tests/sumo/rail/siding/loop_4veh3/deadlocks.sumo b/tests/sumo/rail/siding/loop_4veh3/deadlocks.sumo
new file mode 100644
index 000000000000..e377cc676853
--- /dev/null
+++ b/tests/sumo/rail/siding/loop_4veh3/deadlocks.sumo
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- generated on 2024-10-09 09:46:20 by Eclipse SUMO sumo Version v1_20_0+0627-9f0eaa86dc7
+This data file and the accompanying materials
+are made available under the terms of the Eclipse Public License v2.0
+which accompanies this distribution, and is available at
+http://www.eclipse.org/legal/epl-v20.html
+This file may also be made available under the following Secondary
+Licenses when the conditions for such availability set forth in the Eclipse
+Public License 2.0 are satisfied: GNU General Public License, version 2
+or later which is available at
+https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
+SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
+
+    <input>
+        <net-file value="net.net.xml"/>
+        <route-files value="input_routes.rou.xml"/>
+    </input>
+
+    <output>
+        <write-license value="true"/>
+        <tripinfo-output value="tripinfos.xml"/>
+        <railsignal-block-output value="railsignal_blocks.xml"/>
+        <deadlock-output value="deadlocks.xml"/>
+    </output>
+
+    <processing>
+        <collision.action value="warn"/>
+        <time-to-teleport.railsignal-deadlock value="200"/>
+        <default.speeddev value="0"/>
+    </processing>
+
+    <report>
+        <xml-validation value="never"/>
+        <duration-log.disable value="true"/>
+        <no-step-log value="true"/>
+    </report>
+
+</configuration>
+-->
+
+<additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
+</additional>
diff --git a/tests/sumo/rail/siding/options.sumo b/tests/sumo/rail/siding/options.sumo
new file mode 100644
index 000000000000..d3973627d54d
--- /dev/null
+++ b/tests/sumo/rail/siding/options.sumo
@@ -0,0 +1 @@
+--deadlock-output deadlocks.xml
diff --git a/tests/sumo/rail/siding/sidingShort_deadlock/deadlocks.sumo b/tests/sumo/rail/siding/sidingShort_deadlock/deadlocks.sumo
new file mode 100644
index 000000000000..0c4f8dd62432
--- /dev/null
+++ b/tests/sumo/rail/siding/sidingShort_deadlock/deadlocks.sumo
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- generated on 2024-10-09 09:46:20 by Eclipse SUMO sumo Version v1_20_0+0627-9f0eaa86dc7
+This data file and the accompanying materials
+are made available under the terms of the Eclipse Public License v2.0
+which accompanies this distribution, and is available at
+http://www.eclipse.org/legal/epl-v20.html
+This file may also be made available under the following Secondary
+Licenses when the conditions for such availability set forth in the Eclipse
+Public License 2.0 are satisfied: GNU General Public License, version 2
+or later which is available at
+https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
+SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
+
+    <input>
+        <net-file value="net.net.xml"/>
+        <route-files value="input_routes.rou.xml"/>
+    </input>
+
+    <output>
+        <write-license value="true"/>
+        <tripinfo-output value="tripinfos.xml"/>
+        <railsignal-block-output value="railsignal_blocks.xml"/>
+        <deadlock-output value="deadlocks.xml"/>
+    </output>
+
+    <processing>
+        <time-to-teleport.railsignal-deadlock value="200"/>
+        <default.speeddev value="0"/>
+    </processing>
+
+    <report>
+        <xml-validation value="never"/>
+        <duration-log.disable value="true"/>
+        <no-step-log value="true"/>
+    </report>
+
+</configuration>
+-->
+
+<additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
+</additional>
diff --git a/tests/sumo/rail/siding/siding_both_ways/deadlocks.sumo b/tests/sumo/rail/siding/siding_both_ways/deadlocks.sumo
new file mode 100644
index 000000000000..73ef2c8877a2
--- /dev/null
+++ b/tests/sumo/rail/siding/siding_both_ways/deadlocks.sumo
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- generated on 2024-10-09 09:42:14 by Eclipse SUMO sumo Version v1_20_0+0627-9f0eaa86dc7
+This data file and the accompanying materials
+are made available under the terms of the Eclipse Public License v2.0
+which accompanies this distribution, and is available at
+http://www.eclipse.org/legal/epl-v20.html
+This file may also be made available under the following Secondary
+Licenses when the conditions for such availability set forth in the Eclipse
+Public License 2.0 are satisfied: GNU General Public License, version 2
+or later which is available at
+https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
+SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
+
+    <input>
+        <net-file value="net.net.xml"/>
+        <route-files value="input_routes.rou.xml"/>
+    </input>
+
+    <output>
+        <write-license value="true"/>
+        <tripinfo-output value="tripinfos.xml"/>
+        <railsignal-block-output value="railsignal_blocks.xml"/>
+        <deadlock-output value="deadlocks.xml"/>
+    </output>
+
+    <processing>
+        <time-to-teleport.railsignal-deadlock value="200"/>
+        <default.speeddev value="0"/>
+    </processing>
+
+    <report>
+        <xml-validation value="never"/>
+        <duration-log.disable value="true"/>
+        <no-step-log value="true"/>
+    </report>
+
+</configuration>
+-->
+
+<additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
+</additional>
diff --git a/tests/sumo/rail/siding/siding_both_ways2/deadlocks.sumo b/tests/sumo/rail/siding/siding_both_ways2/deadlocks.sumo
new file mode 100644
index 000000000000..73ef2c8877a2
--- /dev/null
+++ b/tests/sumo/rail/siding/siding_both_ways2/deadlocks.sumo
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- generated on 2024-10-09 09:42:14 by Eclipse SUMO sumo Version v1_20_0+0627-9f0eaa86dc7
+This data file and the accompanying materials
+are made available under the terms of the Eclipse Public License v2.0
+which accompanies this distribution, and is available at
+http://www.eclipse.org/legal/epl-v20.html
+This file may also be made available under the following Secondary
+Licenses when the conditions for such availability set forth in the Eclipse
+Public License 2.0 are satisfied: GNU General Public License, version 2
+or later which is available at
+https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
+SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
+
+    <input>
+        <net-file value="net.net.xml"/>
+        <route-files value="input_routes.rou.xml"/>
+    </input>
+
+    <output>
+        <write-license value="true"/>
+        <tripinfo-output value="tripinfos.xml"/>
+        <railsignal-block-output value="railsignal_blocks.xml"/>
+        <deadlock-output value="deadlocks.xml"/>
+    </output>
+
+    <processing>
+        <time-to-teleport.railsignal-deadlock value="200"/>
+        <default.speeddev value="0"/>
+    </processing>
+
+    <report>
+        <xml-validation value="never"/>
+        <duration-log.disable value="true"/>
+        <no-step-log value="true"/>
+    </report>
+
+</configuration>
+-->
+
+<additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
+</additional>
diff --git a/tests/sumo/rail/siding/siding_both_ways3/deadlocks.sumo b/tests/sumo/rail/siding/siding_both_ways3/deadlocks.sumo
new file mode 100644
index 000000000000..73ef2c8877a2
--- /dev/null
+++ b/tests/sumo/rail/siding/siding_both_ways3/deadlocks.sumo
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- generated on 2024-10-09 09:42:14 by Eclipse SUMO sumo Version v1_20_0+0627-9f0eaa86dc7
+This data file and the accompanying materials
+are made available under the terms of the Eclipse Public License v2.0
+which accompanies this distribution, and is available at
+http://www.eclipse.org/legal/epl-v20.html
+This file may also be made available under the following Secondary
+Licenses when the conditions for such availability set forth in the Eclipse
+Public License 2.0 are satisfied: GNU General Public License, version 2
+or later which is available at
+https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
+SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
+
+    <input>
+        <net-file value="net.net.xml"/>
+        <route-files value="input_routes.rou.xml"/>
+    </input>
+
+    <output>
+        <write-license value="true"/>
+        <tripinfo-output value="tripinfos.xml"/>
+        <railsignal-block-output value="railsignal_blocks.xml"/>
+        <deadlock-output value="deadlocks.xml"/>
+    </output>
+
+    <processing>
+        <time-to-teleport.railsignal-deadlock value="200"/>
+        <default.speeddev value="0"/>
+    </processing>
+
+    <report>
+        <xml-validation value="never"/>
+        <duration-log.disable value="true"/>
+        <no-step-log value="true"/>
+    </report>
+
+</configuration>
+-->
+
+<additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
+</additional>
diff --git a/tests/sumo/rail/siding/siding_both_ways4/deadlocks.sumo b/tests/sumo/rail/siding/siding_both_ways4/deadlocks.sumo
new file mode 100644
index 000000000000..73ef2c8877a2
--- /dev/null
+++ b/tests/sumo/rail/siding/siding_both_ways4/deadlocks.sumo
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- generated on 2024-10-09 09:42:14 by Eclipse SUMO sumo Version v1_20_0+0627-9f0eaa86dc7
+This data file and the accompanying materials
+are made available under the terms of the Eclipse Public License v2.0
+which accompanies this distribution, and is available at
+http://www.eclipse.org/legal/epl-v20.html
+This file may also be made available under the following Secondary
+Licenses when the conditions for such availability set forth in the Eclipse
+Public License 2.0 are satisfied: GNU General Public License, version 2
+or later which is available at
+https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
+SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
+
+    <input>
+        <net-file value="net.net.xml"/>
+        <route-files value="input_routes.rou.xml"/>
+    </input>
+
+    <output>
+        <write-license value="true"/>
+        <tripinfo-output value="tripinfos.xml"/>
+        <railsignal-block-output value="railsignal_blocks.xml"/>
+        <deadlock-output value="deadlocks.xml"/>
+    </output>
+
+    <processing>
+        <time-to-teleport.railsignal-deadlock value="200"/>
+        <default.speeddev value="0"/>
+    </processing>
+
+    <report>
+        <xml-validation value="never"/>
+        <duration-log.disable value="true"/>
+        <no-step-log value="true"/>
+    </report>
+
+</configuration>
+-->
+
+<additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
+</additional>
diff --git a/tests/sumo/rail/siding/siding_both_ways_addTrain/deadlocks.sumo b/tests/sumo/rail/siding/siding_both_ways_addTrain/deadlocks.sumo
new file mode 100644
index 000000000000..73ef2c8877a2
--- /dev/null
+++ b/tests/sumo/rail/siding/siding_both_ways_addTrain/deadlocks.sumo
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- generated on 2024-10-09 09:42:14 by Eclipse SUMO sumo Version v1_20_0+0627-9f0eaa86dc7
+This data file and the accompanying materials
+are made available under the terms of the Eclipse Public License v2.0
+which accompanies this distribution, and is available at
+http://www.eclipse.org/legal/epl-v20.html
+This file may also be made available under the following Secondary
+Licenses when the conditions for such availability set forth in the Eclipse
+Public License 2.0 are satisfied: GNU General Public License, version 2
+or later which is available at
+https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
+SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
+
+    <input>
+        <net-file value="net.net.xml"/>
+        <route-files value="input_routes.rou.xml"/>
+    </input>
+
+    <output>
+        <write-license value="true"/>
+        <tripinfo-output value="tripinfos.xml"/>
+        <railsignal-block-output value="railsignal_blocks.xml"/>
+        <deadlock-output value="deadlocks.xml"/>
+    </output>
+
+    <processing>
+        <time-to-teleport.railsignal-deadlock value="200"/>
+        <default.speeddev value="0"/>
+    </processing>
+
+    <report>
+        <xml-validation value="never"/>
+        <duration-log.disable value="true"/>
+        <no-step-log value="true"/>
+    </report>
+
+</configuration>
+-->
+
+<additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
+</additional>
diff --git a/tests/sumo/rail/siding/siding_deadlock/deadlocks.sumo b/tests/sumo/rail/siding/siding_deadlock/deadlocks.sumo
new file mode 100644
index 000000000000..73ef2c8877a2
--- /dev/null
+++ b/tests/sumo/rail/siding/siding_deadlock/deadlocks.sumo
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- generated on 2024-10-09 09:42:14 by Eclipse SUMO sumo Version v1_20_0+0627-9f0eaa86dc7
+This data file and the accompanying materials
+are made available under the terms of the Eclipse Public License v2.0
+which accompanies this distribution, and is available at
+http://www.eclipse.org/legal/epl-v20.html
+This file may also be made available under the following Secondary
+Licenses when the conditions for such availability set forth in the Eclipse
+Public License 2.0 are satisfied: GNU General Public License, version 2
+or later which is available at
+https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
+SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
+
+    <input>
+        <net-file value="net.net.xml"/>
+        <route-files value="input_routes.rou.xml"/>
+    </input>
+
+    <output>
+        <write-license value="true"/>
+        <tripinfo-output value="tripinfos.xml"/>
+        <railsignal-block-output value="railsignal_blocks.xml"/>
+        <deadlock-output value="deadlocks.xml"/>
+    </output>
+
+    <processing>
+        <time-to-teleport.railsignal-deadlock value="200"/>
+        <default.speeddev value="0"/>
+    </processing>
+
+    <report>
+        <xml-validation value="never"/>
+        <duration-log.disable value="true"/>
+        <no-step-log value="true"/>
+    </report>
+
+</configuration>
+-->
+
+<additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
+</additional>
diff --git a/tests/sumo/rail/siding/siding_deadlock2/deadlocks.sumo b/tests/sumo/rail/siding/siding_deadlock2/deadlocks.sumo
new file mode 100644
index 000000000000..d73bbf64758f
--- /dev/null
+++ b/tests/sumo/rail/siding/siding_deadlock2/deadlocks.sumo
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- generated on 2024-10-09 09:46:20 by Eclipse SUMO sumo Version v1_20_0+0627-9f0eaa86dc7
+This data file and the accompanying materials
+are made available under the terms of the Eclipse Public License v2.0
+which accompanies this distribution, and is available at
+http://www.eclipse.org/legal/epl-v20.html
+This file may also be made available under the following Secondary
+Licenses when the conditions for such availability set forth in the Eclipse
+Public License 2.0 are satisfied: GNU General Public License, version 2
+or later which is available at
+https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
+SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
+
+    <input>
+        <net-file value="net.net.xml"/>
+        <route-files value="input_routes.rou.xml"/>
+    </input>
+
+    <output>
+        <write-license value="true"/>
+        <tripinfo-output value="tripinfos.xml"/>
+        <railsignal-block-output value="railsignal_blocks.xml"/>
+        <deadlock-output value="deadlocks.xml"/>
+    </output>
+
+    <processing>
+        <collision.action value="warn"/>
+        <time-to-teleport.railsignal-deadlock value="200"/>
+        <default.speeddev value="0"/>
+    </processing>
+
+    <report>
+        <xml-validation value="never"/>
+        <duration-log.disable value="true"/>
+        <no-step-log value="true"/>
+    </report>
+
+</configuration>
+-->
+
+<additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
+    <deadlock time="230.00" signals="D F C2 A" vehicles="t3 t1 t2 t0"/>
+</additional>
diff --git a/tests/sumo/rail/siding/siding_deadlock2/errors.sumo b/tests/sumo/rail/siding/siding_deadlock2/errors.sumo
index 5e823aa13788..a5d9d0a7cfd1 100644
--- a/tests/sumo/rail/siding/siding_deadlock2/errors.sumo
+++ b/tests/sumo/rail/siding/siding_deadlock2/errors.sumo
@@ -1,6 +1,6 @@
-Warning: Teleporting vehicle 't0'; waited too long (yield), lane='d_0', time=330.00.
-Warning: Teleporting vehicle 't3'; waited too long (yield), lane='-g_0', time=330.00.
-Warning: Teleporting vehicle 't2'; waited too long (yield), lane='a_0', time=330.00.
-Warning: Vehicle 't0' ends teleporting on edge 'e', time=330.00.
-Warning: Vehicle 't2' ends teleporting on edge 'b', time=330.00.
-Warning: Vehicle 't3' ends teleporting on edge '-d2', time=350.00.
+Warning: Teleporting vehicle 't0'; waited too long (yield, railSignal), lane='d_0', time=230.00.
+Warning: Teleporting vehicle 't3'; waited too long (yield, railSignal), lane='-g_0', time=230.00.
+Warning: Teleporting vehicle 't2'; waited too long (yield, railSignal), lane='a_0', time=230.00.
+Warning: Vehicle 't0' ends teleporting on edge 'e', time=230.00.
+Warning: Vehicle 't2' ends teleporting on edge 'b', time=230.00.
+Warning: Vehicle 't3' ends teleporting on edge '-d2', time=250.00.
diff --git a/tests/sumo/rail/siding/siding_deadlock2/tripinfos.sumo b/tests/sumo/rail/siding/siding_deadlock2/tripinfos.sumo
index c93e3ec8a926..740c287a0f41 100644
--- a/tests/sumo/rail/siding/siding_deadlock2/tripinfos.sumo
+++ b/tests/sumo/rail/siding/siding_deadlock2/tripinfos.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-10-07 17:24:11 by Eclipse SUMO sumo Version v1_20_0+0623-4d64fbde829
+<!-- generated on 2024-10-09 09:37:33 by Eclipse SUMO sumo Version v1_20_0+0627-9f0eaa86dc7
 This data file and the accompanying materials
 are made available under the terms of the Eclipse Public License v2.0
 which accompanies this distribution, and is available at
@@ -26,6 +26,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
 
     <processing>
         <collision.action value="warn"/>
+        <time-to-teleport.railsignal-deadlock value="200"/>
         <default.speeddev value="0"/>
     </processing>
 
@@ -39,8 +40,8 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
 -->
 
 <tripinfos xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/tripinfo_file.xsd">
-    <tripinfo id="t0" depart="0.00" departLane="d_0" departPos="50.10" departSpeed="10.74" departDelay="0.00" arrival="348.00" arrivalLane="g_0" arrivalPos="100.00" arrivalSpeed="13.89" duration="348.00" routeLength="350.01" waitingTime="301.00" waitingCount="1" stopTime="20.00" timeLoss="306.41" rerouteNo="1" devices="tripinfo_t0 routing_t0" vType="train" speedFactor="1.00" vaporized=""/>
-    <tripinfo id="t2" depart="20.00" departLane="a_0" departPos="50.10" departSpeed="10.74" departDelay="0.00" arrival="376.00" arrivalLane="d_0" arrivalPos="100.00" arrivalSpeed="0.25" duration="356.00" routeLength="350.01" waitingTime="301.00" waitingCount="1" stopTime="22.00" timeLoss="312.46" rerouteNo="1" devices="tripinfo_t2 routing_t2" vType="train" speedFactor="1.00" vaporized=""/>
-    <tripinfo id="t1" depart="0.00" departLane="-d2_0" departPos="50.10" departSpeed="10.60" departDelay="0.00" arrival="382.00" arrivalLane="-a_0" arrivalPos="100.00" arrivalSpeed="13.00" duration="382.00" routeLength="390.36" waitingTime="300.00" waitingCount="1" stopTime="21.00" timeLoss="332.64" rerouteNo="1" devices="tripinfo_t1 routing_t1" vType="train" speedFactor="1.00" vaporized=""/>
-    <tripinfo id="t3" depart="20.00" departLane="-g_0" departPos="50.10" departSpeed="10.74" departDelay="0.00" arrival="383.00" arrivalLane="-d2_0" arrivalPos="98.67" arrivalSpeed="0.25" duration="363.00" routeLength="381.81" waitingTime="301.00" waitingCount="1" stopTime="23.00" timeLoss="312.96" rerouteNo="1" devices="tripinfo_t3 routing_t3" vType="train" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="t0" depart="0.00" departLane="d_0" departPos="50.10" departSpeed="10.74" departDelay="0.00" arrival="248.00" arrivalLane="g_0" arrivalPos="100.00" arrivalSpeed="13.89" duration="248.00" routeLength="350.01" waitingTime="201.00" waitingCount="1" stopTime="20.00" timeLoss="206.41" rerouteNo="1" devices="tripinfo_t0 routing_t0" vType="train" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="t2" depart="20.00" departLane="a_0" departPos="50.10" departSpeed="10.74" departDelay="0.00" arrival="276.00" arrivalLane="d_0" arrivalPos="100.00" arrivalSpeed="0.25" duration="256.00" routeLength="350.01" waitingTime="201.00" waitingCount="1" stopTime="22.00" timeLoss="212.46" rerouteNo="1" devices="tripinfo_t2 routing_t2" vType="train" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="t1" depart="0.00" departLane="-d2_0" departPos="50.10" departSpeed="10.60" departDelay="0.00" arrival="282.00" arrivalLane="-a_0" arrivalPos="100.00" arrivalSpeed="13.00" duration="282.00" routeLength="390.36" waitingTime="200.00" waitingCount="1" stopTime="21.00" timeLoss="232.64" rerouteNo="1" devices="tripinfo_t1 routing_t1" vType="train" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="t3" depart="20.00" departLane="-g_0" departPos="50.10" departSpeed="10.74" departDelay="0.00" arrival="283.00" arrivalLane="-d2_0" arrivalPos="98.67" arrivalSpeed="0.25" duration="263.00" routeLength="381.81" waitingTime="201.00" waitingCount="1" stopTime="23.00" timeLoss="212.96" rerouteNo="1" devices="tripinfo_t3 routing_t3" vType="train" speedFactor="1.00" vaporized=""/>
 </tripinfos>
diff --git a/tests/sumo/rail/siding/siding_noSignal/deadlocks.sumo b/tests/sumo/rail/siding/siding_noSignal/deadlocks.sumo
new file mode 100644
index 000000000000..0c4f8dd62432
--- /dev/null
+++ b/tests/sumo/rail/siding/siding_noSignal/deadlocks.sumo
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- generated on 2024-10-09 09:46:20 by Eclipse SUMO sumo Version v1_20_0+0627-9f0eaa86dc7
+This data file and the accompanying materials
+are made available under the terms of the Eclipse Public License v2.0
+which accompanies this distribution, and is available at
+http://www.eclipse.org/legal/epl-v20.html
+This file may also be made available under the following Secondary
+Licenses when the conditions for such availability set forth in the Eclipse
+Public License 2.0 are satisfied: GNU General Public License, version 2
+or later which is available at
+https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
+SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
+
+    <input>
+        <net-file value="net.net.xml"/>
+        <route-files value="input_routes.rou.xml"/>
+    </input>
+
+    <output>
+        <write-license value="true"/>
+        <tripinfo-output value="tripinfos.xml"/>
+        <railsignal-block-output value="railsignal_blocks.xml"/>
+        <deadlock-output value="deadlocks.xml"/>
+    </output>
+
+    <processing>
+        <time-to-teleport.railsignal-deadlock value="200"/>
+        <default.speeddev value="0"/>
+    </processing>
+
+    <report>
+        <xml-validation value="never"/>
+        <duration-log.disable value="true"/>
+        <no-step-log value="true"/>
+    </report>
+
+</configuration>
+-->
+
+<additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
+</additional>
diff --git a/tests/sumo/rail/siding/siding_noSignal2/deadlocks.sumo b/tests/sumo/rail/siding/siding_noSignal2/deadlocks.sumo
new file mode 100644
index 000000000000..0c4f8dd62432
--- /dev/null
+++ b/tests/sumo/rail/siding/siding_noSignal2/deadlocks.sumo
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- generated on 2024-10-09 09:46:20 by Eclipse SUMO sumo Version v1_20_0+0627-9f0eaa86dc7
+This data file and the accompanying materials
+are made available under the terms of the Eclipse Public License v2.0
+which accompanies this distribution, and is available at
+http://www.eclipse.org/legal/epl-v20.html
+This file may also be made available under the following Secondary
+Licenses when the conditions for such availability set forth in the Eclipse
+Public License 2.0 are satisfied: GNU General Public License, version 2
+or later which is available at
+https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
+SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
+
+    <input>
+        <net-file value="net.net.xml"/>
+        <route-files value="input_routes.rou.xml"/>
+    </input>
+
+    <output>
+        <write-license value="true"/>
+        <tripinfo-output value="tripinfos.xml"/>
+        <railsignal-block-output value="railsignal_blocks.xml"/>
+        <deadlock-output value="deadlocks.xml"/>
+    </output>
+
+    <processing>
+        <time-to-teleport.railsignal-deadlock value="200"/>
+        <default.speeddev value="0"/>
+    </processing>
+
+    <report>
+        <xml-validation value="never"/>
+        <duration-log.disable value="true"/>
+        <no-step-log value="true"/>
+    </report>
+
+</configuration>
+-->
+
+<additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
+</additional>
diff --git a/tests/sumo/rail/siding/siding_occupied_advance/deadlocks.sumo b/tests/sumo/rail/siding/siding_occupied_advance/deadlocks.sumo
new file mode 100644
index 000000000000..0c4f8dd62432
--- /dev/null
+++ b/tests/sumo/rail/siding/siding_occupied_advance/deadlocks.sumo
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- generated on 2024-10-09 09:46:20 by Eclipse SUMO sumo Version v1_20_0+0627-9f0eaa86dc7
+This data file and the accompanying materials
+are made available under the terms of the Eclipse Public License v2.0
+which accompanies this distribution, and is available at
+http://www.eclipse.org/legal/epl-v20.html
+This file may also be made available under the following Secondary
+Licenses when the conditions for such availability set forth in the Eclipse
+Public License 2.0 are satisfied: GNU General Public License, version 2
+or later which is available at
+https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
+SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
+
+    <input>
+        <net-file value="net.net.xml"/>
+        <route-files value="input_routes.rou.xml"/>
+    </input>
+
+    <output>
+        <write-license value="true"/>
+        <tripinfo-output value="tripinfos.xml"/>
+        <railsignal-block-output value="railsignal_blocks.xml"/>
+        <deadlock-output value="deadlocks.xml"/>
+    </output>
+
+    <processing>
+        <time-to-teleport.railsignal-deadlock value="200"/>
+        <default.speeddev value="0"/>
+    </processing>
+
+    <report>
+        <xml-validation value="never"/>
+        <duration-log.disable value="true"/>
+        <no-step-log value="true"/>
+    </report>
+
+</configuration>
+-->
+
+<additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
+</additional>
diff --git a/tests/sumo/rail/siding/triangle_6veh/deadlocks.sumo b/tests/sumo/rail/siding/triangle_6veh/deadlocks.sumo
new file mode 100644
index 000000000000..90e35439a91f
--- /dev/null
+++ b/tests/sumo/rail/siding/triangle_6veh/deadlocks.sumo
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- generated on 2024-10-09 09:46:20 by Eclipse SUMO sumo Version v1_20_0+0627-9f0eaa86dc7
+This data file and the accompanying materials
+are made available under the terms of the Eclipse Public License v2.0
+which accompanies this distribution, and is available at
+http://www.eclipse.org/legal/epl-v20.html
+This file may also be made available under the following Secondary
+Licenses when the conditions for such availability set forth in the Eclipse
+Public License 2.0 are satisfied: GNU General Public License, version 2
+or later which is available at
+https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
+SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
+
+    <input>
+        <net-file value="net.net.xml"/>
+        <route-files value="input_routes.rou.xml"/>
+    </input>
+
+    <output>
+        <write-license value="true"/>
+        <tripinfo-output value="tripinfos.xml"/>
+        <railsignal-block-output value="railsignal_blocks.xml"/>
+        <deadlock-output value="deadlocks.xml"/>
+    </output>
+
+    <processing>
+        <collision.action value="warn"/>
+        <time-to-teleport.railsignal-deadlock value="200"/>
+        <default.speeddev value="0"/>
+    </processing>
+
+    <report>
+        <xml-validation value="never"/>
+        <duration-log.disable value="true"/>
+        <no-step-log value="true"/>
+    </report>
+
+</configuration>
+-->
+
+<additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
+    <deadlock time="218.00" signals="A2 B3 A C E C2" vehicles="t4 t1 t0 t3 t2 t5"/>
+</additional>
diff --git a/tests/sumo/rail/siding/triangle_6veh/errors.sumo b/tests/sumo/rail/siding/triangle_6veh/errors.sumo
index 18a01fb911ad..2e6f527c97b0 100644
--- a/tests/sumo/rail/siding/triangle_6veh/errors.sumo
+++ b/tests/sumo/rail/siding/triangle_6veh/errors.sumo
@@ -1,9 +1,9 @@
-Warning: Teleporting vehicle 't5'; waited too long (yield), lane='-a2_0', time=318.00.
-Warning: Teleporting vehicle 't3'; waited too long (yield), lane='-f_0', time=318.00.
-Warning: Teleporting vehicle 't1'; waited too long (yield), lane='a_0', time=318.00.
-Warning: Vehicle 't1' skips stop on lane 'c_0' time=334.00.
-Warning: Vehicle 't3' skips stop on lane 'd2_0' time=334.00.
-Warning: Vehicle 't5' skips stop on lane 'c3_0' time=334.00.
-Warning: Vehicle 't1' ends teleporting on edge 'f', time=367.00.
-Warning: Vehicle 't3' ends teleporting on edge 'a2', time=370.00.
-Warning: Vehicle 't5' ends teleporting on edge '-a', time=370.00.
+Warning: Teleporting vehicle 't5'; waited too long (yield, railSignal), lane='-a2_0', time=218.00.
+Warning: Teleporting vehicle 't3'; waited too long (yield, railSignal), lane='-f_0', time=218.00.
+Warning: Teleporting vehicle 't1'; waited too long (yield, railSignal), lane='a_0', time=218.00.
+Warning: Vehicle 't1' skips stop on lane 'c_0' time=234.00.
+Warning: Vehicle 't3' skips stop on lane 'd2_0' time=234.00.
+Warning: Vehicle 't5' skips stop on lane 'c3_0' time=234.00.
+Warning: Vehicle 't1' ends teleporting on edge 'f', time=267.00.
+Warning: Vehicle 't3' ends teleporting on edge 'a2', time=270.00.
+Warning: Vehicle 't5' ends teleporting on edge '-a', time=270.00.
diff --git a/tests/sumo/rail/siding/triangle_6veh/tripinfos.sumo b/tests/sumo/rail/siding/triangle_6veh/tripinfos.sumo
index 4ed22dc82b43..9065a2b174d0 100644
--- a/tests/sumo/rail/siding/triangle_6veh/tripinfos.sumo
+++ b/tests/sumo/rail/siding/triangle_6veh/tripinfos.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-10-07 22:16:39 by Eclipse SUMO sumo Version v1_20_0+0623-4d64fbde829
+<!-- generated on 2024-10-09 09:37:33 by Eclipse SUMO sumo Version v1_20_0+0627-9f0eaa86dc7
 This data file and the accompanying materials
 are made available under the terms of the Eclipse Public License v2.0
 which accompanies this distribution, and is available at
@@ -26,6 +26,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
 
     <processing>
         <collision.action value="warn"/>
+        <time-to-teleport.railsignal-deadlock value="200"/>
         <default.speeddev value="0"/>
     </processing>
 
@@ -39,10 +40,10 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
 -->
 
 <tripinfos xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/tripinfo_file.xsd">
-    <tripinfo id="t0" depart="0.00" departLane="a_0" departPos="50.10" departSpeed="13.89" departDelay="0.00" arrival="367.00" arrivalLane="f_0" arrivalPos="100.00" arrivalSpeed="12.25" duration="367.00" routeLength="750.22" waitingTime="260.00" waitingCount="1" stopTime="20.00" timeLoss="292.55" rerouteNo="1" devices="tripinfo_t0 routing_t0" vType="train" speedFactor="1.00" vaporized=""/>
-    <tripinfo id="t2" depart="0.00" departLane="-f_0" departPos="50.10" departSpeed="13.89" departDelay="0.00" arrival="370.00" arrivalLane="a2_0" arrivalPos="100.00" arrivalSpeed="13.00" duration="370.00" routeLength="773.80" waitingTime="261.00" waitingCount="1" stopTime="21.00" timeLoss="293.06" rerouteNo="1" devices="tripinfo_t2 routing_t2" vType="train" speedFactor="1.00" vaporized=""/>
-    <tripinfo id="t4" depart="0.00" departLane="-a2_0" departPos="50.10" departSpeed="13.89" departDelay="0.00" arrival="370.00" arrivalLane="-a_0" arrivalPos="100.00" arrivalSpeed="13.00" duration="370.00" routeLength="691.13" waitingTime="266.00" waitingCount="1" stopTime="22.00" timeLoss="297.99" rerouteNo="1" devices="tripinfo_t4 routing_t4" vType="train" speedFactor="1.00" vaporized=""/>
-    <tripinfo id="t1" depart="8.00" departLane="a_0" departPos="50.10" departSpeed="10.74" departDelay="8.00" arrival="371.00" arrivalLane="f_0" arrivalPos="100.00" arrivalSpeed="13.89" duration="363.00" routeLength="734.86" waitingTime="301.00" waitingCount="1" stopTime="0.00" timeLoss="306.48" rerouteNo="1" devices="tripinfo_t1 routing_t1" vType="train" speedFactor="1.00" vaporized=""/>
-    <tripinfo id="t3" depart="8.00" departLane="-f_0" departPos="50.10" departSpeed="10.74" departDelay="8.00" arrival="374.00" arrivalLane="a2_0" arrivalPos="100.00" arrivalSpeed="13.89" duration="366.00" routeLength="759.12" waitingTime="301.00" waitingCount="1" stopTime="0.00" timeLoss="306.48" rerouteNo="1" devices="tripinfo_t3 routing_t3" vType="train" speedFactor="1.00" vaporized=""/>
-    <tripinfo id="t5" depart="8.00" departLane="-a2_0" departPos="50.10" departSpeed="10.74" departDelay="8.00" arrival="374.00" arrivalLane="-a_0" arrivalPos="100.00" arrivalSpeed="13.89" duration="366.00" routeLength="674.95" waitingTime="301.00" waitingCount="1" stopTime="0.00" timeLoss="306.48" rerouteNo="1" devices="tripinfo_t5 routing_t5" vType="train" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="t0" depart="0.00" departLane="a_0" departPos="50.10" departSpeed="13.89" departDelay="0.00" arrival="267.00" arrivalLane="f_0" arrivalPos="100.00" arrivalSpeed="12.25" duration="267.00" routeLength="750.22" waitingTime="160.00" waitingCount="1" stopTime="20.00" timeLoss="192.55" rerouteNo="1" devices="tripinfo_t0 routing_t0" vType="train" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="t2" depart="0.00" departLane="-f_0" departPos="50.10" departSpeed="13.89" departDelay="0.00" arrival="270.00" arrivalLane="a2_0" arrivalPos="100.00" arrivalSpeed="13.00" duration="270.00" routeLength="773.80" waitingTime="161.00" waitingCount="1" stopTime="21.00" timeLoss="193.06" rerouteNo="1" devices="tripinfo_t2 routing_t2" vType="train" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="t4" depart="0.00" departLane="-a2_0" departPos="50.10" departSpeed="13.89" departDelay="0.00" arrival="270.00" arrivalLane="-a_0" arrivalPos="100.00" arrivalSpeed="13.00" duration="270.00" routeLength="691.13" waitingTime="166.00" waitingCount="1" stopTime="22.00" timeLoss="197.99" rerouteNo="1" devices="tripinfo_t4 routing_t4" vType="train" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="t1" depart="8.00" departLane="a_0" departPos="50.10" departSpeed="10.74" departDelay="8.00" arrival="271.00" arrivalLane="f_0" arrivalPos="100.00" arrivalSpeed="13.89" duration="263.00" routeLength="734.86" waitingTime="201.00" waitingCount="1" stopTime="0.00" timeLoss="206.48" rerouteNo="1" devices="tripinfo_t1 routing_t1" vType="train" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="t3" depart="8.00" departLane="-f_0" departPos="50.10" departSpeed="10.74" departDelay="8.00" arrival="274.00" arrivalLane="a2_0" arrivalPos="100.00" arrivalSpeed="13.89" duration="266.00" routeLength="759.12" waitingTime="201.00" waitingCount="1" stopTime="0.00" timeLoss="206.48" rerouteNo="1" devices="tripinfo_t3 routing_t3" vType="train" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="t5" depart="8.00" departLane="-a2_0" departPos="50.10" departSpeed="10.74" departDelay="8.00" arrival="274.00" arrivalLane="-a_0" arrivalPos="100.00" arrivalSpeed="13.89" duration="266.00" routeLength="674.95" waitingTime="201.00" waitingCount="1" stopTime="0.00" timeLoss="206.48" rerouteNo="1" devices="tripinfo_t5 routing_t5" vType="train" speedFactor="1.00" vaporized=""/>
 </tripinfos>